mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-24 19:46:21 +01:00
25 lines
1.5 KiB
Diff
25 lines
1.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 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
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/TamableAnimal.java b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
|
||
|
|
index cd565d1a8dab8d45196e4d29cab3d93a3ca619eb..550c7f3435cc6c3180769e47f05bf693bdc380e3 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/TamableAnimal.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
|
||
|
|
@@ -250,7 +250,12 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
|
||
|
|
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(this.getCombatTracker().getDeathMessage());
|
||
|
|
+ }
|
||
|
|
+ // Paper end - Add TameableDeathMessageEvent
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|