mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 12:27:59 +01:00
da9d110d5b
This patch does not appear to be doing anything useful, and may hide errors. Currently, the save logic does not run through this path either so it did not do anything. Additionally, properly implement support for handling RegionFileSizeException in Moonrise.
27 lines
1.8 KiB
Diff
27 lines
1.8 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] 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 dd5aa4bbf2e7bab3be1c3582b090fdf0fa3fb0df..000d1863bfba98b5132dfc6743362d687b2f54f3 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.getType().canSerialize()) {
|
|
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();
|
|
}
|
|
|