From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sun, 5 Jul 2020 00:33:54 -0700 Subject: [PATCH] added PlayerNameEntityEvent diff --git a/src/main/java/net/minecraft/world/item/ItemNameTag.java b/src/main/java/net/minecraft/world/item/ItemNameTag.java index 140a865f4f8fb3e4f787cf8d334d20fac6cb5eef..b9b2b27e534ba87a1aae3c521f393a066a18a199 100644 --- a/src/main/java/net/minecraft/world/item/ItemNameTag.java +++ b/src/main/java/net/minecraft/world/item/ItemNameTag.java @@ -1,11 +1,17 @@ package net.minecraft.world.item; +import net.minecraft.server.level.EntityPlayer; import net.minecraft.world.EnumHand; import net.minecraft.world.EnumInteractionResult; import net.minecraft.world.entity.EntityInsentient; import net.minecraft.world.entity.EntityLiving; import net.minecraft.world.entity.player.EntityHuman; +// Paper start +import io.papermc.paper.adventure.PaperAdventure; +import io.papermc.paper.event.player.PlayerNameEntityEvent; +// Paper end + public class ItemNameTag extends Item { public ItemNameTag(Item.Info item_info) { @@ -16,11 +22,15 @@ public class ItemNameTag extends Item { public EnumInteractionResult a(ItemStack itemstack, EntityHuman entityhuman, EntityLiving entityliving, EnumHand enumhand) { if (itemstack.hasName() && !(entityliving instanceof EntityHuman)) { if (!entityhuman.world.isClientSide && entityliving.isAlive()) { - entityliving.setCustomName(itemstack.getName()); - if (entityliving instanceof EntityInsentient) { - ((EntityInsentient) entityliving).setPersistent(); + // Paper start + PlayerNameEntityEvent event = new PlayerNameEntityEvent(((EntityPlayer) entityhuman).getBukkitEntity(), entityliving.getBukkitLivingEntity(), PaperAdventure.asAdventure(itemstack.getName()), true); + if (!event.callEvent()) return EnumInteractionResult.PASS; + EntityLiving newEntityLiving = ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getEntity()).getHandle(); + newEntityLiving.setCustomName(event.getName() != null ? PaperAdventure.asVanilla(event.getName()) : null); + if (event.isPersistent() && newEntityLiving instanceof EntityInsentient) { + ((EntityInsentient) newEntityLiving).setPersistent(); } - + // Paper end itemstack.subtract(1); }