1 files changed, 26 insertions, 0 deletions
diff --git a/patches/server/0510-Add-PlayerNameEntityEvent.patch b/patches/server/0510-Add-PlayerNameEntityEvent.patch
new file mode 100644
index 0000000000..9287edc1b7
--- /dev/null
+++ b/patches/server/0510-Add-PlayerNameEntityEvent.patch
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sun, 5 Jul 2020 00:33:54 -0700
+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 3ce8c725270510dbaaf2c1edc895d37ea9ca424c..774c982f28b4f127fc3f036c19dfb47fb9ae3264 100644
+--- a/src/main/java/net/minecraft/world/item/NameTagItem.java
++++ b/src/main/java/net/minecraft/world/item/NameTagItem.java
+@@ -18,8 +18,13 @@ public class NameTagItem extends Item {
+         Component component = stack.get(DataComponents.CUSTOM_NAME);
+         if (component != null && !(entity instanceof Player)) {
+             if (!user.level().isClientSide && entity.isAlive()) {
+-                entity.setCustomName(component);
+-                if (entity instanceof Mob mob) {
++                // 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 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) {
++                // Paper end - Add PlayerNameEntityEvent
+                     mob.setPersistenceRequired();
+                 }
+