Check hologram height on spawn properly

CitizensDev · Sep 21, 2021 · 620cda6 · 620cda6
1 parent 49559e2
commit 620cda6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
@@ -95,7 +95,8 @@ private double getEntityHeight() {
     }
 
     private double getHeight(int lineNumber) {
-        return (lineHeight == -1 ? Setting.DEFAULT_NPC_HOLOGRAM_LINE_HEIGHT.asDouble() : lineHeight) * (lineNumber + 1);
+        return (lineHeight == -1 ? Setting.DEFAULT_NPC_HOLOGRAM_LINE_HEIGHT.asDouble() : lineHeight)
+                * (lastNameplateVisible ? lineNumber + 1 : lineNumber);
     }
 
     /**
@@ -212,8 +213,7 @@ public void run() {
             if (!hologramNPC.isSpawned())
                 continue;
             if (update) {
-                hologramNPC.teleport(
-                        currentLoc.clone().add(0, getEntityHeight() + getHeight(nameplateVisible ? i : i - 1), 0),
+                hologramNPC.teleport(currentLoc.clone().add(0, getEntityHeight() + getHeight(i), 0),
                         TeleportCause.PLUGIN);
             }
             if (i >= lines.size()) {