From 95261e45484e199cf29fcc5809d046d46071b234 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Sun, 21 Aug 2016 21:53:08 +0800
Subject: [PATCH] Unchange where tracker replacement happens

---
 main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java       | 3 +++
 .../net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java   | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
index dc90d4341..ffceb4394 100644
--- a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
+++ b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -256,6 +256,9 @@ public class CitizensNPC extends AbstractNPC {
             if (NMS.getStepHeight(entity) < 1) {
                 NMS.setStepHeight(entity, 1);
             }
+            if (getEntity() instanceof Player) {
+                NMS.replaceTrackerEntry((Player) getEntity());
+            }
         }
 
         return true;
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java
index 17d6fb0cb..3f23b8e95 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java
@@ -283,7 +283,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) {
             updateEffects = true;
         }
-        NMS.replaceTrackerEntry(getBukkitEntity());
         tickPotionEffects();
 
         boolean navigating = npc.getNavigator().isNavigating();