diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TippedArrowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TippedArrowController.java
index 42672f76b..466d4a8ad 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TippedArrowController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TippedArrowController.java
@@ -2,8 +2,8 @@ package net.citizensnpcs.nms.v1_10_R1.entity.nonliving;
 
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftArrow;
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftTippedArrow;
 import org.bukkit.entity.Arrow;
 import org.bukkit.util.Vector;
 
@@ -99,7 +99,7 @@ public class TippedArrowController extends MobEntityController {
         }
     }
 
-    public static class TippedArrowNPC extends CraftArrow implements NPCHolder {
+    public static class TippedArrowNPC extends CraftTippedArrow implements NPCHolder {
         private final CitizensNPC npc;
 
         public TippedArrowNPC(EntityTippedArrowNPC entity) {
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TippedArrowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TippedArrowController.java
index 61a64e8a3..593a68505 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TippedArrowController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TippedArrowController.java
@@ -2,8 +2,8 @@ package net.citizensnpcs.nms.v1_11_R1.entity.nonliving;
 
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_11_R1.entity.CraftArrow;
 import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_11_R1.entity.CraftTippedArrow;
 import org.bukkit.entity.Arrow;
 import org.bukkit.util.Vector;
 
@@ -39,6 +39,15 @@ public class TippedArrowController extends MobEntityController {
             this.npc = (CitizensNPC) npc;
         }
 
+        @Override
+        public void A_() {
+            if (npc != null) {
+                npc.update();
+            } else {
+                super.A_();
+            }
+        }
+
         @Override
         public void collide(net.minecraft.server.v1_11_R1.Entity entity) {
             // this method is called by both the entities involved - cancelling
@@ -88,18 +97,9 @@ public class TippedArrowController extends MobEntityController {
         public NPC getNPC() {
             return npc;
         }
-
-        @Override
-        public void A_() {
-            if (npc != null) {
-                npc.update();
-            } else {
-                super.A_();
-            }
-        }
     }
 
-    public static class TippedArrowNPC extends CraftArrow implements NPCHolder {
+    public static class TippedArrowNPC extends CraftTippedArrow implements NPCHolder {
         private final CitizensNPC npc;
 
         public TippedArrowNPC(EntityTippedArrowNPC entity) {
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TippedArrowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TippedArrowController.java
index bcb25aaeb..1ac720e47 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TippedArrowController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TippedArrowController.java
@@ -2,8 +2,8 @@ package net.citizensnpcs.nms.v1_12_R1.entity.nonliving;
 
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_12_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_12_R1.entity.CraftArrow;
 import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_12_R1.entity.CraftTippedArrow;
 import org.bukkit.entity.Arrow;
 import org.bukkit.util.Vector;
 
@@ -39,6 +39,15 @@ public class TippedArrowController extends MobEntityController {
             this.npc = (CitizensNPC) npc;
         }
 
+        @Override
+        public void B_() {
+            if (npc != null) {
+                npc.update();
+            } else {
+                super.B_();
+            }
+        }
+
         @Override
         public void collide(net.minecraft.server.v1_12_R1.Entity entity) {
             // this method is called by both the entities involved - cancelling
@@ -88,18 +97,9 @@ public class TippedArrowController extends MobEntityController {
         public NPC getNPC() {
             return npc;
         }
-
-        @Override
-        public void B_() {
-            if (npc != null) {
-                npc.update();
-            } else {
-                super.B_();
-            }
-        }
     }
 
-    public static class TippedArrowNPC extends CraftArrow implements NPCHolder {
+    public static class TippedArrowNPC extends CraftTippedArrow implements NPCHolder {
         private final CitizensNPC npc;
 
         public TippedArrowNPC(EntityTippedArrowNPC entity) {
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java
index 5e8ec8fc4..06a894202 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java
@@ -2,8 +2,8 @@ package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R2.entity.CraftArrow;
 import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftTippedArrow;
 import org.bukkit.entity.Arrow;
 import org.bukkit.util.Vector;
 
@@ -99,7 +99,7 @@ public class TippedArrowController extends MobEntityController {
         }
     }
 
-    public static class TippedArrowNPC extends CraftArrow implements NPCHolder {
+    public static class TippedArrowNPC extends CraftTippedArrow implements NPCHolder {
         private final CitizensNPC npc;
 
         public TippedArrowNPC(EntityTippedArrowNPC entity) {
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java
index 6858188fd..482558b1b 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java
@@ -1,16 +1,16 @@
 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;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_14_R1.entity.CraftTippedArrow;
 import org.bukkit.entity.Arrow;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_14_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
@@ -101,7 +101,7 @@ public class TippedArrowController extends MobEntityController {
         }
     }
 
-    public static class TippedArrowNPC extends CraftArrow implements NPCHolder {
+    public static class TippedArrowNPC extends CraftTippedArrow implements NPCHolder {
         private final CitizensNPC npc;
 
         public TippedArrowNPC(EntityTippedArrowNPC entity) {
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java
index cbcc20ff2..0235b7bff 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java
@@ -2,8 +2,8 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
 
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftArrow;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_15_R1.entity.CraftTippedArrow;
 import org.bukkit.entity.TippedArrow;
 import org.bukkit.util.Vector;
 
@@ -101,7 +101,7 @@ public class TippedArrowController extends MobEntityController {
         }
     }
 
-    public static class TippedArrowNPC extends CraftArrow implements NPCHolder {
+    public static class TippedArrowNPC extends CraftTippedArrow implements NPCHolder {
         private final CitizensNPC npc;
 
         public TippedArrowNPC(EntityTippedArrowNPC entity) {
diff --git a/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/TippedArrowController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/TippedArrowController.java
index 81b7e5f8d..d13eb4a6e 100644
--- a/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/TippedArrowController.java
+++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/TippedArrowController.java
@@ -2,8 +2,8 @@ package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_16_R2.entity.CraftArrow;
 import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_16_R2.entity.CraftTippedArrow;
 import org.bukkit.entity.TippedArrow;
 import org.bukkit.util.Vector;
 
@@ -101,7 +101,7 @@ public class TippedArrowController extends MobEntityController {
         }
     }
 
-    public static class TippedArrowNPC extends CraftArrow implements NPCHolder {
+    public static class TippedArrowNPC extends CraftTippedArrow implements NPCHolder {
         private final CitizensNPC npc;
 
         public TippedArrowNPC(EntityTippedArrowNPC entity) {