aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0523-Add-PlayerNameEntityEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0523-Add-PlayerNameEntityEvent.patch')
-rw-r--r--patches/server/0523-Add-PlayerNameEntityEvent.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/server/0523-Add-PlayerNameEntityEvent.patch b/patches/server/0523-Add-PlayerNameEntityEvent.patch
index 805158471a..eec1c1a2eb 100644
--- a/patches/server/0523-Add-PlayerNameEntityEvent.patch
+++ b/patches/server/0523-Add-PlayerNameEntityEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerNameEntityEvent
diff --git a/src/main/java/net/minecraft/world/item/NameTagItem.java b/src/main/java/net/minecraft/world/item/NameTagItem.java
-index af072de68435d1678651bdf2fa13b314ca9c9d58..d12b3fb8b5e28ba4524d163878be978b1b42d019 100644
+index af072de68435d1678651bdf2fa13b314ca9c9d58..a0b3c2d3b3f86ecd6cb80ff767839d29ca4f4f68 100644
--- a/src/main/java/net/minecraft/world/item/NameTagItem.java
+++ b/src/main/java/net/minecraft/world/item/NameTagItem.java
@@ -15,9 +15,14 @@ public class NameTagItem extends Item {
@@ -18,10 +18,10 @@ index af072de68435d1678651bdf2fa13b314ca9c9d58..d12b3fb8b5e28ba4524d163878be978b
+ // Paper start - Add PlayerNameEntityEvent
+ io.papermc.paper.event.player.PlayerNameEntityEvent event = new io.papermc.paper.event.player.PlayerNameEntityEvent(((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity(), entity.getBukkitLivingEntity(), io.papermc.paper.adventure.PaperAdventure.asAdventure(stack.getHoverName()), true);
+ if (!event.callEvent()) return InteractionResult.PASS;
-+ LivingEntity newEntityLiving = ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getEntity()).getHandle();
-+ newEntityLiving.setCustomName(event.getName() != null ? io.papermc.paper.adventure.PaperAdventure.asVanilla(event.getName()) : null);
-+ if (event.isPersistent() && newEntityLiving instanceof Mob) {
-+ ((Mob) newEntityLiving).setPersistenceRequired();
++ LivingEntity newEntity = ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getEntity()).getHandle();
++ newEntity.setCustomName(event.getName() != null ? io.papermc.paper.adventure.PaperAdventure.asVanilla(event.getName()) : null);
++ if (event.isPersistent() && newEntity instanceof Mob) {
++ ((Mob) newEntity).setPersistenceRequired();
+ // Paper end - Add PlayerNameEntityEvent
}