Minor shulker fix

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

@@ -179,7 +179,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected EntityAIBodyControl s() {
-            return new EntityAIBodyControl(this);
+            return npc == null ? super.s() : new EntityAIBodyControl(this);
         }
 
         @Override

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

@@ -1,7 +1,6 @@
 package net.citizensnpcs.nms.v1_11_R1.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.DyeColor;
 import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity;
 import org.bukkit.craftbukkit.v1_11_R1.entity.CraftShulker;
@@ -180,11 +179,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected EntityAIBodyControl s() {
-            return new EntityAIBodyControl(this);
+            return npc == null ? super.s() : new EntityAIBodyControl(this);
-        }
-
-        public void setColor(DyeColor color) {
-            this.datawatcher.set(bw, color.getWoolData());
         }
 
         @Override

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

@@ -186,7 +186,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected EntityAIBodyControl s() {
-            return new EntityAIBodyControl(this);
+            return npc == null ? super.s() : new EntityAIBodyControl(this);
         }
 
         @Override

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

@@ -206,7 +206,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected EntityAIBodyControl o() {
-            return new EntityAIBodyControl(this);
+            return npc == null ? super.o() : new EntityAIBodyControl(this);
         }
 
         @Override

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

@@ -202,7 +202,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected EntityAIBodyControl o() {
-            return new EntityAIBodyControl(this);
+            return npc == null ? super.o() : new EntityAIBodyControl(this);
         }
 
         @Override

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

@@ -203,7 +203,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected EntityAIBodyControl o() {
-            return new EntityAIBodyControl(this);
+            return npc == null ? super.o() : new EntityAIBodyControl(this);
         }
 
         @Override

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

@@ -203,7 +203,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected EntityAIBodyControl r() {
-            return new EntityAIBodyControl(this);
+            return npc == null ? super.r() : new EntityAIBodyControl(this);
         }
 
         @Override

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

@@ -91,7 +91,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected BodyRotationControl createBodyControl() {
-            return new BodyRotationControl(this);
+            return npc == null ? super.createBodyControl() : new BodyRotationControl(this);
         }
 
         @Override

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

@@ -92,7 +92,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected BodyRotationControl createBodyControl() {
-            return new BodyRotationControl(this);
+            return npc == null ? super.createBodyControl() : new BodyRotationControl(this);
         }
 
         @Override

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

@@ -93,7 +93,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected BodyRotationControl createBodyControl() {
-            return new BodyRotationControl(this);
+            return npc == null ? super.createBodyControl() : new BodyRotationControl(this);
         }
 
         @Override

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

@@ -92,7 +92,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected BodyRotationControl createBodyControl() {
-            return new BodyRotationControl(this);
+            return npc == null ? super.createBodyControl() : new BodyRotationControl(this);
         }
 
         @Override