From c0425663b6883fb1f5023b9bc4dfb5f8eac38e07 Mon Sep 17 00:00:00 2001 From: fullwall Date: Wed, 15 Nov 2023 16:30:12 +0800 Subject: [PATCH] Move hologram meta check to abstract NPC --- src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java b/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java index 92c3e36a..7ca7cf1b 100644 --- a/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java +++ b/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java @@ -384,11 +384,10 @@ public void removeTrait(Class traitClass) { @Override public boolean requiresNameHologram() { - return getEntityType() != EntityType.ARMOR_STAND && !getEntityType().name().equals("TEXT_DISPLAY") - && (name.length() > 16 && getEntityType() == EntityType.PLAYER - || data().get(NPC.Metadata.ALWAYS_USE_NAME_HOLOGRAM, false) - || coloredNameStringCache != null && coloredNameStringCache.contains("§x") - || !Placeholders.replaceName(name, null, this).equals(name)); + return !data().has(NPC.Metadata.HOLOGRAM_FOR) && ((name.length() > 16 && getEntityType() == EntityType.PLAYER) + || data().get(NPC.Metadata.ALWAYS_USE_NAME_HOLOGRAM, false) + || coloredNameStringCache != null && coloredNameStringCache.contains("§x") + || !Placeholders.replaceName(name, null, this).equals(name)); } @Override