Fix name tags affecting NPC names

CitizensDev · Jun 15, 2014 · a45733e · a45733e
1 parent 5e198e6
commit a45733e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -64,7 +64,7 @@ public boolean despawn(DespawnReason reason) {
         }
         Bukkit.getPluginManager().callEvent(event);
         if (event.isCancelled()) {
-            getEntity().getLocation().getChunk().load();
+            getEntity().getLocation().getChunk();
             Messaging.debug("Couldn't despawn", getId(), "due to despawn event cancellation. Force loaded chunk.");
             return false;
         }
@@ -230,6 +230,9 @@ public void update() {
 
                 if (!getNavigator().isNavigating()
                         && getEntity().getWorld().getFullTime() % Setting.PACKET_UPDATE_DELAY.asInt() == 0) {
+                    if (getEntity() instanceof LivingEntity) {
+                        ((LivingEntity) getEntity()).setCustomName(getFullName());
+                    }
                     Player player = getEntity() instanceof Player ? (Player) getEntity() : null;
                     NMS.sendPacketNearby(player, getStoredLocation(),
                             new PacketPlayOutEntityTeleport(NMS.getHandle(getEntity())));
@@ -256,4 +259,4 @@ private void updateFlyableState() {
     }
 
     private static final String NPC_METADATA_MARKER = "NPC";
-}
+}