From 8f23a7f6af2b541f2693a6b73e761c1d0fc9b5e2 Mon Sep 17 00:00:00 2001
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
Date: Mon, 21 Jun 2021 21:24:45 -0400
Subject: [PATCH] Add TameableDeathMessageEvent

---
 .../world/entity/TamableAnimal.java.patch        | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/paper-server/patches/sources/net/minecraft/world/entity/TamableAnimal.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/TamableAnimal.java.patch
index 00092769b9..82acf3b49d 100644
--- a/paper-server/patches/sources/net/minecraft/world/entity/TamableAnimal.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/TamableAnimal.java.patch
@@ -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 {