2021-06-11 14:02:28 +02:00
|
|
|
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
|
2024-01-19 22:13:42 +01:00
|
|
|
Subject: [PATCH] Add PlayerNameEntityEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/item/NameTagItem.java b/src/main/java/net/minecraft/world/item/NameTagItem.java
|
2024-01-19 22:13:42 +01:00
|
|
|
index af072de68435d1678651bdf2fa13b314ca9c9d58..d12b3fb8b5e28ba4524d163878be978b1b42d019 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/item/NameTagItem.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/item/NameTagItem.java
|
2023-06-08 02:54:54 +02:00
|
|
|
@@ -15,9 +15,14 @@ public class NameTagItem extends Item {
|
2021-06-11 14:02:28 +02:00
|
|
|
public InteractionResult interactLivingEntity(ItemStack stack, Player user, LivingEntity entity, InteractionHand hand) {
|
|
|
|
if (stack.hasCustomHoverName() && !(entity instanceof Player)) {
|
2023-06-08 02:54:54 +02:00
|
|
|
if (!user.level().isClientSide && entity.isAlive()) {
|
2021-06-11 14:02:28 +02:00
|
|
|
- entity.setCustomName(stack.getHoverName());
|
|
|
|
- if (entity instanceof Mob) {
|
2021-06-15 04:59:31 +02:00
|
|
|
- ((Mob)entity).setPersistenceRequired();
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper start - Add PlayerNameEntityEvent
|
2023-06-08 02:54:54 +02:00
|
|
|
+ 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);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ if (!event.callEvent()) return InteractionResult.PASS;
|
|
|
|
+ LivingEntity newEntityLiving = ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getEntity()).getHandle();
|
2023-06-08 02:54:54 +02:00
|
|
|
+ newEntityLiving.setCustomName(event.getName() != null ? io.papermc.paper.adventure.PaperAdventure.asVanilla(event.getName()) : null);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ if (event.isPersistent() && newEntityLiving instanceof Mob) {
|
|
|
|
+ ((Mob) newEntityLiving).setPersistenceRequired();
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper end - Add PlayerNameEntityEvent
|
2021-06-15 04:59:31 +02:00
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2021-06-15 04:59:31 +02:00
|
|
|
stack.shrink(1);
|