fix for new spigot mappings update, fixes #1806

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java

@@ -130,8 +130,8 @@ public class BatController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new BatNPC(this);
+                NMSImpl.setBukkitEntity(this, new BatNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java

@@ -121,8 +121,8 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new BlazeNPC(this);
+                NMSImpl.setBukkitEntity(this, new BlazeNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java

@@ -158,8 +158,8 @@ public class CatController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new CatNPC(this);
+                NMSImpl.setBukkitEntity(this, new CatNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java

@@ -145,8 +145,8 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new CaveSpiderNPC(this);
+                NMSImpl.setBukkitEntity(this, new CaveSpiderNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java

@@ -159,8 +159,8 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new ChickenNPC(this);
+                NMSImpl.setBukkitEntity(this, new ChickenNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java

@@ -147,8 +147,9 @@ public class CodController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new CodNPC(this);
+                NMSImpl.setBukkitEntity(this, new CodNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java

@@ -158,8 +158,8 @@ public class CowController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new CowNPC(this);
+                NMSImpl.setBukkitEntity(this, new CowNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java

@@ -147,8 +147,8 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new CreeperNPC(this);
+                NMSImpl.setBukkitEntity(this, new CreeperNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java

@@ -146,8 +146,9 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new DolphinNPC(this);
+                NMSImpl.setBukkitEntity(this, new DolphinNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java

@@ -145,8 +145,9 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new DrownedNPC(this);
+                NMSImpl.setBukkitEntity(this, new DrownedNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java

@@ -119,8 +119,8 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new EnderDragonNPC(this);
+                NMSImpl.setBukkitEntity(this, new EnderDragonNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java

@@ -152,8 +152,8 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new EndermanNPC(this);
+                NMSImpl.setBukkitEntity(this, new EndermanNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java

@@ -144,8 +144,8 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new EndermiteNPC(this);
+                NMSImpl.setBukkitEntity(this, new EndermiteNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java

@@ -221,8 +221,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public CraftPlayer getBukkitEntity() {
-        if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+        if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-            bukkitEntity = new PlayerNPC(this);
+            NMSImpl.setBukkitEntity(this, new PlayerNPC(this));
         }
         return super.getBukkitEntity();
     }
@@ -411,7 +411,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) {
             updateEffects = true;
         }
-        Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", bukkitEntity);
+        Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", getBukkitEntity());
         livingEntityBaseTick();
 
         boolean navigating = npc.getNavigator().isNavigating();

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java

@@ -132,8 +132,8 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new EvokerNPC(this);
+                NMSImpl.setBukkitEntity(this, new EvokerNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java

@@ -144,8 +144,8 @@ public class FoxController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new FoxNPC(this);
+                NMSImpl.setBukkitEntity(this, new FoxNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java

@@ -107,8 +107,8 @@ public class GhastController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new GhastNPC(this);
+                NMSImpl.setBukkitEntity(this, new GhastNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java

@@ -130,8 +130,8 @@ public class GiantController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new GiantNPC(this);
+                NMSImpl.setBukkitEntity(this, new GiantNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java

@@ -131,8 +131,8 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new GuardianNPC(this);
+                NMSImpl.setBukkitEntity(this, new GuardianNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java

@@ -131,8 +131,8 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new GuardianElderNPC(this);
+                NMSImpl.setBukkitEntity(this, new GuardianElderNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java

@@ -155,8 +155,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new HorseNPC(this);
+                NMSImpl.setBukkitEntity(this, new HorseNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java

@@ -155,8 +155,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new HorseDonkeyNPC(this);
+                NMSImpl.setBukkitEntity(this, new HorseDonkeyNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java

@@ -155,8 +155,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new HorseMuleNPC(this);
+                NMSImpl.setBukkitEntity(this, new HorseMuleNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java

@@ -156,8 +156,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new HorseSkeletonNPC(this);
+                NMSImpl.setBukkitEntity(this, new HorseSkeletonNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java

@@ -156,8 +156,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new HorseZombieNPC(this);
+                NMSImpl.setBukkitEntity(this, new HorseZombieNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java

@@ -132,8 +132,9 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new IllusionerNPC(this);
+                NMSImpl.setBukkitEntity(this, new IllusionerNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java

@@ -130,8 +130,8 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new IronGolemNPC(this);
+                NMSImpl.setBukkitEntity(this, new IronGolemNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java

@@ -155,8 +155,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new LlamaNPC(this);
+                NMSImpl.setBukkitEntity(this, new LlamaNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java

@@ -134,8 +134,8 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new MagmaCubeNPC(this);
+                NMSImpl.setBukkitEntity(this, new MagmaCubeNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java

@@ -145,8 +145,8 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new MushroomCowNPC(this);
+                NMSImpl.setBukkitEntity(this, new MushroomCowNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java

@@ -151,8 +151,8 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new OcelotNPC(this);
+                NMSImpl.setBukkitEntity(this, new OcelotNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java

@@ -144,8 +144,8 @@ public class PandaController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new PandaNPC(this);
+                NMSImpl.setBukkitEntity(this, new PandaNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java

@@ -116,8 +116,8 @@ public class ParrotController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new ParrotNPC(this);
+                NMSImpl.setBukkitEntity(this, new ParrotNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java

@@ -144,8 +144,9 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new PhantomNPC(this);
+                NMSImpl.setBukkitEntity(this, new PhantomNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java

@@ -152,8 +152,8 @@ public class PigController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new PigNPC(this);
+                NMSImpl.setBukkitEntity(this, new PigNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java

@@ -133,8 +133,8 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new PigZombieNPC(this);
+                NMSImpl.setBukkitEntity(this, new PigZombieNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java

@@ -158,8 +158,8 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new PillagerNPC(this);
+                NMSImpl.setBukkitEntity(this, new PillagerNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java

@@ -119,8 +119,8 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new PolarBearNPC(this);
+                NMSImpl.setBukkitEntity(this, new PolarBearNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java

@@ -133,8 +133,9 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new PufferFishNPC(this);
+                NMSImpl.setBukkitEntity(this, new PufferFishNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java

@@ -147,8 +147,8 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new RabbitNPC(this);
+                NMSImpl.setBukkitEntity(this, new RabbitNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java

@@ -158,8 +158,8 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new RavagerNPC(this);
+                NMSImpl.setBukkitEntity(this, new RavagerNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java

@@ -133,8 +133,9 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new SalmonNPC(this);
+                NMSImpl.setBukkitEntity(this, new SalmonNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java

@@ -144,8 +144,8 @@ public class SheepController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new SheepNPC(this);
+                NMSImpl.setBukkitEntity(this, new SheepNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java

@@ -131,8 +131,9 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new ShulkerNPC(this);
+                NMSImpl.setBukkitEntity(this, new ShulkerNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java

@@ -129,8 +129,9 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new SilverfishNPC(this);
+                NMSImpl.setBukkitEntity(this, new SilverfishNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java

@@ -131,8 +131,9 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new SkeletonNPC(this);
+                NMSImpl.setBukkitEntity(this, new SkeletonNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java

@@ -131,8 +131,9 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new StrayNPC(this);
+                NMSImpl.setBukkitEntity(this, new StrayNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java

@@ -131,8 +131,9 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new SkeletonWitherNPC(this);
+                NMSImpl.setBukkitEntity(this, new SkeletonWitherNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java

@@ -135,8 +135,9 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new SlimeNPC(this);
+                NMSImpl.setBukkitEntity(this, new SlimeNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java

@@ -130,8 +130,9 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new SnowmanNPC(this);
+                NMSImpl.setBukkitEntity(this, new SnowmanNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java

@@ -131,8 +131,9 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new SpiderNPC(this);
+                NMSImpl.setBukkitEntity(this, new SpiderNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java

@@ -131,8 +131,9 @@ public class SquidController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new SquidNPC(this);
+                NMSImpl.setBukkitEntity(this, new SquidNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java

@@ -158,8 +158,8 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new TraderLlamaNPC(this);
+                NMSImpl.setBukkitEntity(this, new TraderLlamaNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java

@@ -133,8 +133,9 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new TropicalFishNPC(this);
+                NMSImpl.setBukkitEntity(this, new TropicalFishNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java

@@ -135,8 +135,9 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new TurtleNPC(this);
+                NMSImpl.setBukkitEntity(this, new TurtleNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java

@@ -108,8 +108,9 @@ public class VexController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new VexNPC(this);
+                NMSImpl.setBukkitEntity(this, new VexNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java

@@ -176,8 +176,9 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new VillagerNPC(this);
+                NMSImpl.setBukkitEntity(this, new VillagerNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java

@@ -145,8 +145,9 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new VindicatorNPC(this);
+                NMSImpl.setBukkitEntity(this, new VindicatorNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java

@@ -175,8 +175,9 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new WanderingTraderNPC(this);
+                NMSImpl.setBukkitEntity(this, new WanderingTraderNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java

@@ -131,8 +131,9 @@ public class WitchController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new WitchNPC(this);
+                NMSImpl.setBukkitEntity(this, new WitchNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java

@@ -106,8 +106,9 @@ public class WitherController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new WitherNPC(this);
+                NMSImpl.setBukkitEntity(this, new WitherNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java

@@ -147,8 +147,9 @@ public class WolfController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new WolfNPC(this);
+                NMSImpl.setBukkitEntity(this, new WolfNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java

@@ -131,8 +131,9 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new ZombieNPC(this);
+                NMSImpl.setBukkitEntity(this, new ZombieNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java

@@ -131,8 +131,9 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new ZombieHuskNPC(this);
+                NMSImpl.setBukkitEntity(this, new ZombieHuskNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java

@@ -131,8 +131,9 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new ZombieVillagerNPC(this);
+                NMSImpl.setBukkitEntity(this, new ZombieVillagerNPC(this));
+            }
             return super.getBukkitEntity();
         }
 

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/AreaEffectCloudController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftAreaEffectCloud;
@@ -93,8 +94,8 @@ public class AreaEffectCloudController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new AreaEffectCloudNPC(this);
+                NMSImpl.setBukkitEntity(this, new AreaEffectCloudNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ArmorStandController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftArmorStand;
@@ -110,8 +111,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new ArmorStandNPC(this);
+                NMSImpl.setBukkitEntity(this, new ArmorStandNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/BoatController.java

@@ -94,8 +94,8 @@ public class BoatController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new BoatNPC(this);
+                NMSImpl.setBukkitEntity(this, new BoatNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/DragonFireballController.java

@@ -94,8 +94,8 @@ public class DragonFireballController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new DragonFireballNPC(this);
+                NMSImpl.setBukkitEntity(this, new DragonFireballNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EggController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
@@ -109,8 +110,8 @@ public class EggController extends AbstractEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new EggNPC(this);
+                NMSImpl.setBukkitEntity(this, new EggNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderCrystalController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEnderCrystal;
@@ -93,8 +94,8 @@ public class EnderCrystalController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new EnderCrystalNPC(this);
+                NMSImpl.setBukkitEntity(this, new EnderCrystalNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderPearlController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEnderPearl;
@@ -93,8 +94,8 @@ public class EnderPearlController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new EnderPearlNPC(this);
+                NMSImpl.setBukkitEntity(this, new EnderPearlNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderSignalController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEnderSignal;
@@ -93,8 +94,8 @@ public class EnderSignalController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new EnderSignalNPC(this);
+                NMSImpl.setBukkitEntity(this, new EnderSignalNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EvokerFangsController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
@@ -96,8 +97,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new EvokerFangsNPC(this);
+                NMSImpl.setBukkitEntity(this, new EvokerFangsNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ExperienceOrbController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
@@ -79,8 +80,8 @@ public class ExperienceOrbController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new ExperienceOrbNPC(this);
+                NMSImpl.setBukkitEntity(this, new ExperienceOrbNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java

@@ -113,8 +113,8 @@ public class FallingBlockController extends AbstractEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new FallingBlockNPC(this);
+                NMSImpl.setBukkitEntity(this, new FallingBlockNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FireworkController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
@@ -79,8 +80,8 @@ public class FireworkController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new FireworkNPC(this);
+                NMSImpl.setBukkitEntity(this, new FireworkNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FishingHookController.java

@@ -2,6 +2,7 @@ package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
 import java.util.UUID;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
@@ -93,8 +94,8 @@ public class FishingHookController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new FishingHookNPC(this);
+                NMSImpl.setBukkitEntity(this, new FishingHookNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -103,8 +104,8 @@ public class ItemController extends AbstractEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new ItemNPC(this);
+                NMSImpl.setBukkitEntity(this, new ItemNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemFrameController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -95,8 +96,8 @@ public class ItemFrameController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new ItemFrameNPC(this);
+                NMSImpl.setBukkitEntity(this, new ItemFrameNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LargeFireballController.java

@@ -80,8 +80,8 @@ public class LargeFireballController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new LargeFireballNPC(this);
+                NMSImpl.setBukkitEntity(this, new LargeFireballNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LeashController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
@@ -79,8 +80,8 @@ public class LeashController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new LeashNPC(this);
+                NMSImpl.setBukkitEntity(this, new LeashNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LlamaSpitController.java

@@ -99,8 +99,8 @@ public class LlamaSpitController extends AbstractEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new LlamaSpitNPC(this);
+                NMSImpl.setBukkitEntity(this, new LlamaSpitNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java

@@ -88,8 +88,8 @@ public class MinecartChestController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new MinecartChestNPC(this);
+                NMSImpl.setBukkitEntity(this, new MinecartChestNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java

@@ -88,8 +88,8 @@ public class MinecartCommandController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new MinecartCommandNPC(this);
+                NMSImpl.setBukkitEntity(this, new MinecartCommandNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java

@@ -88,8 +88,8 @@ public class MinecartFurnaceController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new MinecartFurnaceNPC(this);
+                NMSImpl.setBukkitEntity(this, new MinecartFurnaceNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java

@@ -88,8 +88,8 @@ public class MinecartRideableController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new MinecartRideableNPC(this);
+                NMSImpl.setBukkitEntity(this, new MinecartRideableNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/PaintingController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
@@ -79,8 +80,8 @@ public class PaintingController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new PaintingNPC(this);
+                NMSImpl.setBukkitEntity(this, new PaintingNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ShulkerBulletController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
@@ -79,8 +80,8 @@ public class ShulkerBulletController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new ShulkerBulletNPC(this);
+                NMSImpl.setBukkitEntity(this, new ShulkerBulletNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SmallFireballController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
@@ -79,8 +80,8 @@ public class SmallFireballController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new SmallFireballNPC(this);
+                NMSImpl.setBukkitEntity(this, new SmallFireballNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SnowballController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
@@ -79,8 +80,8 @@ public class SnowballController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new SnowballNPC(this);
+                NMSImpl.setBukkitEntity(this, new SnowballNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SpectralArrowController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftArrow;
@@ -79,8 +80,8 @@ public class SpectralArrowController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new SpectralArrowNPC(this);
+                NMSImpl.setBukkitEntity(this, new SpectralArrowNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TNTPrimedController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
@@ -79,8 +80,8 @@ public class TNTPrimedController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new TNTPrimedNPC(this);
+                NMSImpl.setBukkitEntity(this, new TNTPrimedNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownExpBottleController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
@@ -79,8 +80,8 @@ public class ThrownExpBottleController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new ThrownExpBottleNPC(this);
+                NMSImpl.setBukkitEntity(this, new ThrownExpBottleNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownPotionController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
@@ -80,11 +81,11 @@ public class ThrownPotionController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 if (getItem() != null && getItem().getItem().equals(Items.LINGERING_POTION)) {
-                    bukkitEntity = new LingeringThrownPotionNPC(this);
+                    NMSImpl.setBukkitEntity(this, new LingeringThrownPotionNPC(this));
                 } else {
-                    bukkitEntity = new SplashThrownPotionNPC(this);
+                    NMSImpl.setBukkitEntity(this, new SplashThrownPotionNPC(this));
                 }
             }
             return super.getBukkitEntity();

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownTridentController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
@@ -79,8 +80,8 @@ public class ThrownTridentController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new ThrownTridentNPC(this);
+                NMSImpl.setBukkitEntity(this, new ThrownTridentNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftArrow;
@@ -79,8 +80,8 @@ public class TippedArrowController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new TippedArrowNPC(this);
+                NMSImpl.setBukkitEntity(this, new TippedArrowNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/WitherSkullController.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.nms.v1_14_R1.entity.nonliving;
 
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
@@ -79,8 +80,8 @@ public class WitherSkullController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                bukkitEntity = new WitherSkullNPC(this);
+                NMSImpl.setBukkitEntity(this, new WitherSkullNPC(this));
             }
             return super.getBukkitEntity();
         }

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java

@@ -1654,6 +1654,14 @@ public class NMSImpl implements NMSBridge {
         navigation.c();
     }
 
+    public static void setBukkitEntity(Entity entity, CraftEntity bukkitEntity) {
+        try {
+            BUKKITENTITY_FIELD_SETTER.invoke(entity, bukkitEntity);
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+    }
+
     private static final MethodHandle ADVANCEMENT_PLAYER_FIELD = NMS.getFinalSetter(EntityPlayer.class,
             "advancementDataPlayer");
     private static final Set<EntityType> BAD_CONTROLLER_LOOK = EnumSet.of(EntityType.POLAR_BEAR, EntityType.SILVERFISH,
@@ -1688,6 +1696,7 @@ public class NMSImpl implements NMSBridge {
     private static final Random RANDOM = Util.getFastRandom();
     private static final MethodHandle SIZE_FIELD_GETTER = NMS.getGetter(Entity.class, "size");
     private static final MethodHandle SIZE_FIELD_SETTER = NMS.getSetter(Entity.class, "size");
+    private static final MethodHandle BUKKITENTITY_FIELD_SETTER = NMS.getSetter(Entity.class, "bukkitEntity");
     private static Field SKULL_PROFILE_FIELD;
     static {
         try {