42 lines
2.2 KiB
Diff
42 lines
2.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
|
Date: Sun, 5 Jul 2020 00:33:54 -0700
|
||
|
|
Subject: [PATCH] added PlayerNameEntityEvent
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/ItemNameTag.java b/src/main/java/net/minecraft/server/ItemNameTag.java
|
||
|
|
index 01163ce38602f9345f00ee0535b4e73be7c6d735..a34772e329df62d9176b0aa392197e2771c69da4 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/ItemNameTag.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/ItemNameTag.java
|
||
|
|
@@ -1,5 +1,10 @@
|
||
|
|
package net.minecraft.server;
|
||
|
|
|
||
|
|
+// 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) {
|
||
|
|
@@ -10,11 +15,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);
|
||
|
|
}
|
||
|
|
|