Respect name visibility properly

CitizensDev · Jul 10, 2020 · 652a68a · 652a68a
1 parent 44b6da4
commit 652a68a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -399,7 +399,7 @@ private void updateCustomName() {
         if (!getEntity().isCustomNameVisible()
                 && !data().<Object> get(NPC.NAMEPLATE_VISIBLE_METADATA, true).toString().equals("hover")) {
             getEntity().setCustomName("");
-        } else {
+        } else if (!requiresNameHologram()) {
             nameVisibility = true;
             getEntity().setCustomName(getFullName());
         }

diff --git a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
@@ -77,9 +77,8 @@ public List<String> getLines() {
     private void load() {
         currentLoc = npc.getStoredLocation();
         int i = 0;
-        if (npc.requiresNameHologram()) {
+        if (npc.requiresNameHologram() && npc.data().get(NPC.NAMEPLATE_VISIBLE_METADATA, true)) {
             nameNPC = createHologram(npc.getFullName(), 0);
-            npc.data().set(NPC.NAMEPLATE_VISIBLE_METADATA, false);
         }
         for (String line : lines) {
             hologramNPCs.add(createHologram(Placeholders.replace(line, null, npc), getHeight(i)));
@@ -114,6 +113,15 @@ public void run() {
             unload();
             return;
         }
+        if (npc.requiresNameHologram()) {
+            boolean visible = npc.data().get(NPC.NAMEPLATE_VISIBLE_METADATA, true);
+            if (nameNPC != null && !visible) {
+                nameNPC.destroy();
+                nameNPC = null;
+            } else if (nameNPC == null && visible) {
+                nameNPC = createHologram(npc.getFullName(), 0);
+            }
+        }
         boolean update = currentLoc.distanceSquared(npc.getStoredLocation()) >= 0.01;
         if (update) {
             currentLoc = npc.getStoredLocation();