OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 07:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add TameableDeathMessageEvent

Browse source
This commit is contained in:
Owen1212055 2021-06-21 21:24:45 -04:00
parent 30ccd487cf
commit 8f23a7f6af
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
paper-server/patches/sources/net/minecraft/world/entity/TamableAnimal.java.patch
View file

@ -31,7 +31,21 @@
}
return false;
@@ -295,7 +308,14 @@
@@ -244,7 +257,12 @@
if (entityliving instanceof ServerPlayer) {
ServerPlayer entityplayer = (ServerPlayer) entityliving;
- entityplayer.sendSystemMessage(this.getCombatTracker().getDeathMessage());
+ // Paper start - Add TameableDeathMessageEvent
+ io.papermc.paper.event.entity.TameableDeathMessageEvent event = new io.papermc.paper.event.entity.TameableDeathMessageEvent((org.bukkit.entity.Tameable) getBukkitEntity(), io.papermc.paper.adventure.PaperAdventure.asAdventure(this.getCombatTracker().getDeathMessage()));
+ if (event.callEvent()) {
+ entityplayer.sendSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.deathMessage()));
+ }
+ // Paper end - Add TameableDeathMessageEvent
}
}
}
@@ -295,7 +313,14 @@
if (!this.canTeleportTo(new BlockPos(x, y, z))) {
return false;
} else {