diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java b/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java index d9818427a..4b0d7e561 100644 --- 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 index 9203e5e97..a0b9e8b6e 100644 --- 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