Fix chunk tickets being removed when Citizens is disabled, return cor…

…rect NPC entity in HologramTrait
CitizensDev · Sep 17, 2021 · cdb7cbb · cdb7cbb
1 parent 7952600
commit cdb7cbb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java b/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java
@@ -443,6 +443,8 @@ private boolean updateStationaryStatus() {
     }
 
     private void updateTicket(Location target) {
+        if (!CitizensAPI.hasImplementation() || !CitizensAPI.getPlugin().isEnabled())
+            return;
         if (target != null && this.activeTicket != null
                 && new ChunkCoord(target.getChunk()).equals(new ChunkCoord(this.activeTicket.getChunk()))) {
             this.activeTicket = target.clone();

diff --git a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
@@ -127,7 +127,7 @@ private double getMaxHeight() {
      * Note: this is implementation-specific and may be removed at a later date.
      */
     public ArmorStand getNameEntity() {
-        return nameNPC != null && nameNPC.isSpawned() ? ((ArmorStand) npc.getEntity()) : null;
+        return nameNPC != null && nameNPC.isSpawned() ? ((ArmorStand) nameNPC.getEntity()) : null;
     }
 
     @Override