From 7073bebc1774c2a1ab70c3e76b9645c7d1b76452 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Sat, 25 Nov 2023 04:20:43 +0800
Subject: [PATCH] Move hologram metadata check to CitizensNPC

---
 main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
index dc874ba7b..3f2b4c34e 100644
--- a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
+++ b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -196,7 +196,8 @@ public class CitizensNPC extends AbstractNPC {
 
     @Override
     public boolean requiresNameHologram() {
-        return super.requiresNameHologram() || Setting.ALWAYS_USE_NAME_HOLOGRAM.asBoolean();
+        return !data().has(NPC.Metadata.HOLOGRAM_FOR)
+                && (super.requiresNameHologram() || Setting.ALWAYS_USE_NAME_HOLOGRAM.asBoolean());
     }
 
     private void resetCachedCoord() {