From 647215e8dde844f9b242f8cc85449d814c85caa6 Mon Sep 17 00:00:00 2001 From: fullwall Date: Thu, 18 Jan 2024 17:22:22 +0800 Subject: [PATCH] Fixes to per-player name holograms --- main/src/main/java/net/citizensnpcs/ProtocolLibListener.java | 2 +- main/src/main/java/net/citizensnpcs/trait/HologramTrait.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main/src/main/java/net/citizensnpcs/ProtocolLibListener.java b/main/src/main/java/net/citizensnpcs/ProtocolLibListener.java index dc73a295f..71abfe0ef 100644 --- a/main/src/main/java/net/citizensnpcs/ProtocolLibListener.java +++ b/main/src/main/java/net/citizensnpcs/ProtocolLibListener.java @@ -109,7 +109,7 @@ public class ProtocolLibListener implements Listener { for (WrappedDataValue wdv : wdvs) { if (fakeName != null && wdv.getIndex() == 2) { - wdv.setValue(fakeName); + wdv.setRawValue(fakeName); delta = true; } else if (sneaking && wdv.getIndex() == 0) { byte b = (byte) (((Number) wdv.getValue()).byteValue() | 0x02); diff --git a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java index deeb85aa3..b3463594d 100644 --- a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java +++ b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java @@ -503,10 +503,10 @@ public class HologramTrait extends Trait { if (hologram != null) { String name = Placeholders.replace(text, null, npc); hologram.setName(name); - hologram.data().set(NPC.Metadata.NAMEPLATE_VISIBLE, ChatColor.stripColor(name).length() > 0); if (Placeholders.containsPlaceholders(text)) { hologram.data().set(NPC.Metadata.HOLOGRAM_LINE_SUPPLIER, this); } else { + hologram.data().set(NPC.Metadata.NAMEPLATE_VISIBLE, ChatColor.stripColor(name).length() > 0); hologram.data().remove(NPC.Metadata.HOLOGRAM_LINE_SUPPLIER); } }