diff --git a/main/src/main/java/net/citizensnpcs/EventListen.java b/main/src/main/java/net/citizensnpcs/EventListen.java
index 5d8daf3fd..af61e30b5 100644
--- a/main/src/main/java/net/citizensnpcs/EventListen.java
+++ b/main/src/main/java/net/citizensnpcs/EventListen.java
@@ -41,6 +41,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.bukkit.event.vehicle.VehicleDamageEvent;
 import org.bukkit.event.vehicle.VehicleDestroyEvent;
 import org.bukkit.event.vehicle.VehicleEnterEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
@@ -82,6 +83,7 @@ import net.citizensnpcs.api.event.NPCDespawnEvent;
 import net.citizensnpcs.api.event.NPCLeftClickEvent;
 import net.citizensnpcs.api.event.NPCRightClickEvent;
 import net.citizensnpcs.api.event.NPCSpawnEvent;
+import net.citizensnpcs.api.event.NPCVehicleDamageEvent;
 import net.citizensnpcs.api.event.PlayerCreateNPCEvent;
 import net.citizensnpcs.api.event.SpawnReason;
 import net.citizensnpcs.api.npc.NPC;
@@ -240,7 +242,6 @@ public class EventListen implements Listener {
     @EventHandler
     public void onEntityDamage(EntityDamageEvent event) {
         NPC npc = CitizensAPI.getNPCRegistry().getNPC(event.getEntity());
-
         if (npc == null) {
             if (event instanceof EntityDamageByEntityEvent) {
                 npc = CitizensAPI.getNPCRegistry().getNPC(((EntityDamageByEntityEvent) event).getDamager());
@@ -576,6 +577,28 @@ public class EventListen implements Listener {
         }.runTaskTimer(CitizensAPI.getPlugin(), 0, 1);
     }
 
+    @EventHandler
+    public void onVehicleDamage(VehicleDamageEvent event) {
+        NPC npc = CitizensAPI.getNPCRegistry().getNPC(event.getVehicle());
+        if (npc == null) {
+            return;
+        }
+        event.setCancelled(npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true));
+
+        NPCVehicleDamageEvent damageEvent = new NPCVehicleDamageEvent(npc, event);
+        Bukkit.getPluginManager().callEvent(damageEvent);
+
+        if (!damageEvent.isCancelled() || !(damageEvent.getDamager() instanceof Player))
+            return;
+        Player damager = (Player) damageEvent.getDamager();
+
+        NPCLeftClickEvent leftClickEvent = new NPCLeftClickEvent(npc, damager);
+        Bukkit.getPluginManager().callEvent(leftClickEvent);
+        if (npc.hasTrait(CommandTrait.class)) {
+            npc.getTrait(CommandTrait.class).dispatch(damager, CommandTrait.Hand.LEFT);
+        }
+    }
+
     @EventHandler
     public void onVehicleDestroy(VehicleDestroyEvent event) {
         NPC npc = CitizensAPI.getNPCRegistry().getNPC(event.getVehicle());
diff --git a/main/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java b/main/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java
index e3745bcc1..bda5b2b6e 100644
--- a/main/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java
+++ b/main/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java
@@ -231,8 +231,9 @@ public class SkinPacketTracker {
         // cancel previous packet tasks so they do not interfere with
         // new tasks
         void cancel() {
-            if (removeTask != null)
+            if (removeTask != null) {
                 removeTask.cancel();
+            }
             removeCount = 0;
         }
     }
diff --git a/main/src/main/java/net/citizensnpcs/npc/skin/TabListRemover.java b/main/src/main/java/net/citizensnpcs/npc/skin/TabListRemover.java
index 2f4477bcf..581ef9d18 100644
--- a/main/src/main/java/net/citizensnpcs/npc/skin/TabListRemover.java
+++ b/main/src/main/java/net/citizensnpcs/npc/skin/TabListRemover.java
@@ -129,7 +129,6 @@ public class TabListRemover {
                 int i = 0;
                 Iterator<SkinnableEntity> skinIterator = entry.toRemove.iterator();
                 while (skinIterator.hasNext()) {
-
                     if (i >= maxPacketEntries)
                         break;
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java
index f96dc4fe2..084d74aaa 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_10_R1.DamageSource;
 import net.minecraft.server.v1_10_R1.EntityMinecartChest;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.World;
@@ -56,13 +55,6 @@ public class MinecartChestController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void g(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java
index aa8ca0887..da90746c0 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_10_R1.DamageSource;
 import net.minecraft.server.v1_10_R1.EntityMinecartCommandBlock;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.World;
@@ -56,13 +55,6 @@ public class MinecartCommandController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void g(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java
index b5bcf071d..246506a64 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_10_R1.DamageSource;
 import net.minecraft.server.v1_10_R1.EntityMinecartFurnace;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.World;
@@ -56,13 +55,6 @@ public class MinecartFurnaceController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void g(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java
index 15f51f7e7..d54018c44 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_10_R1.DamageSource;
 import net.minecraft.server.v1_10_R1.EntityMinecartHopper;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.World;
@@ -52,13 +51,6 @@ public class MinecartHopperController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void g(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java
index b09849e77..a29d4b971 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_10_R1.DamageSource;
 import net.minecraft.server.v1_10_R1.EntityMinecartRideable;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.World;
@@ -56,13 +55,6 @@ public class MinecartRideableController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void g(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java
index 67f47f0e2..8c591d1d7 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_10_R1.DamageSource;
 import net.minecraft.server.v1_10_R1.EntityMinecartMobSpawner;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.World;
@@ -52,13 +51,6 @@ public class MinecartSpawnerController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void g(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java
index 6b7d483fe..9aa133da2 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_10_R1.DamageSource;
 import net.minecraft.server.v1_10_R1.EntityMinecartTNT;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.World;
@@ -52,13 +51,6 @@ public class MinecartTNTController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void g(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java
index c8a46cd68..a194c2a45 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_11_R1.DamageSource;
 import net.minecraft.server.v1_11_R1.EntityMinecartChest;
 import net.minecraft.server.v1_11_R1.NBTTagCompound;
 import net.minecraft.server.v1_11_R1.World;
@@ -65,13 +64,6 @@ public class MinecartChestController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java
index b0a5de140..92f929d6e 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_11_R1.DamageSource;
 import net.minecraft.server.v1_11_R1.EntityMinecartCommandBlock;
 import net.minecraft.server.v1_11_R1.NBTTagCompound;
 import net.minecraft.server.v1_11_R1.World;
@@ -65,13 +64,6 @@ public class MinecartCommandController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java
index 71a5ef2b6..d38e73bdf 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_11_R1.DamageSource;
 import net.minecraft.server.v1_11_R1.EntityMinecartFurnace;
 import net.minecraft.server.v1_11_R1.NBTTagCompound;
 import net.minecraft.server.v1_11_R1.World;
@@ -65,13 +64,6 @@ public class MinecartFurnaceController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java
index ed7996a09..ca76d38f6 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_11_R1.DamageSource;
 import net.minecraft.server.v1_11_R1.EntityMinecartHopper;
 import net.minecraft.server.v1_11_R1.NBTTagCompound;
 import net.minecraft.server.v1_11_R1.World;
@@ -61,13 +60,6 @@ public class MinecartHopperController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java
index 6edee5596..b8baf2368 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_11_R1.DamageSource;
 import net.minecraft.server.v1_11_R1.EntityMinecartRideable;
 import net.minecraft.server.v1_11_R1.NBTTagCompound;
 import net.minecraft.server.v1_11_R1.World;
@@ -65,13 +64,6 @@ public class MinecartRideableController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java
index 39762b07e..d22b8edfa 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_11_R1.DamageSource;
 import net.minecraft.server.v1_11_R1.EntityMinecartMobSpawner;
 import net.minecraft.server.v1_11_R1.NBTTagCompound;
 import net.minecraft.server.v1_11_R1.World;
@@ -61,13 +60,6 @@ public class MinecartSpawnerController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java
index dc598ca24..e401954fd 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_11_R1.DamageSource;
 import net.minecraft.server.v1_11_R1.EntityMinecartTNT;
 import net.minecraft.server.v1_11_R1.NBTTagCompound;
 import net.minecraft.server.v1_11_R1.World;
@@ -61,13 +60,6 @@ public class MinecartTNTController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java
index 1635f391f..b66ca3aea 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_12_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_12_R1.DamageSource;
 import net.minecraft.server.v1_12_R1.EntityMinecartChest;
 import net.minecraft.server.v1_12_R1.NBTTagCompound;
 import net.minecraft.server.v1_12_R1.World;
@@ -65,13 +64,6 @@ public class MinecartChestController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java
index 2722f084c..ed6d1c0a4 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_12_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_12_R1.DamageSource;
 import net.minecraft.server.v1_12_R1.EntityMinecartCommandBlock;
 import net.minecraft.server.v1_12_R1.NBTTagCompound;
 import net.minecraft.server.v1_12_R1.World;
@@ -65,13 +64,6 @@ public class MinecartCommandController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java
index 7181c459e..12bcac62c 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_12_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_12_R1.DamageSource;
 import net.minecraft.server.v1_12_R1.EntityMinecartFurnace;
 import net.minecraft.server.v1_12_R1.NBTTagCompound;
 import net.minecraft.server.v1_12_R1.World;
@@ -65,13 +64,6 @@ public class MinecartFurnaceController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java
index 2ae6e4dc3..ae2f6dfd8 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_12_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_12_R1.DamageSource;
 import net.minecraft.server.v1_12_R1.EntityMinecartHopper;
 import net.minecraft.server.v1_12_R1.NBTTagCompound;
 import net.minecraft.server.v1_12_R1.World;
@@ -61,13 +60,6 @@ public class MinecartHopperController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java
index 1cd537307..ad42a3b13 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_12_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_12_R1.DamageSource;
 import net.minecraft.server.v1_12_R1.EntityMinecartRideable;
 import net.minecraft.server.v1_12_R1.NBTTagCompound;
 import net.minecraft.server.v1_12_R1.World;
@@ -65,13 +64,6 @@ public class MinecartRideableController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java
index f4b9df21e..dd38e4821 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_12_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_12_R1.DamageSource;
 import net.minecraft.server.v1_12_R1.EntityMinecartMobSpawner;
 import net.minecraft.server.v1_12_R1.NBTTagCompound;
 import net.minecraft.server.v1_12_R1.World;
@@ -61,13 +60,6 @@ public class MinecartSpawnerController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java
index 7c5160070..e0a37a25f 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_12_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_12_R1.DamageSource;
 import net.minecraft.server.v1_12_R1.EntityMinecartTNT;
 import net.minecraft.server.v1_12_R1.NBTTagCompound;
 import net.minecraft.server.v1_12_R1.World;
@@ -61,13 +60,6 @@ public class MinecartTNTController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java
index 34dbc94a3..553e8c19e 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R2.DamageSource;
 import net.minecraft.server.v1_13_R2.EntityMinecartChest;
 import net.minecraft.server.v1_13_R2.NBTTagCompound;
 import net.minecraft.server.v1_13_R2.World;
@@ -41,15 +40,6 @@ public class MinecartChestController extends MobEntityController {
             this.npc = (CitizensNPC) npc;
         }
 
-        @Override
-        public void tick() {
-            super.tick();
-            if (npc != null) {
-                npc.update();
-                NMSImpl.minecartItemLogic(this);
-            }
-        }
-
         @Override
         public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
@@ -65,13 +55,6 @@ public class MinecartChestController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
@@ -107,6 +90,15 @@ public class MinecartChestController extends MobEntityController {
             return npc;
         }
 
+        @Override
+        public void tick() {
+            super.tick();
+            if (npc != null) {
+                npc.update();
+                NMSImpl.minecartItemLogic(this);
+            }
+        }
+
     }
 
     public static class MinecartChestNPC extends CraftMinecartChest implements NPCHolder {
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java
index 44424dcdd..4152f4e06 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R2.DamageSource;
 import net.minecraft.server.v1_13_R2.EntityMinecartCommandBlock;
 import net.minecraft.server.v1_13_R2.NBTTagCompound;
 import net.minecraft.server.v1_13_R2.World;
@@ -41,15 +40,6 @@ public class MinecartCommandController extends MobEntityController {
             this.npc = (CitizensNPC) npc;
         }
 
-        @Override
-        public void tick() {
-            super.tick();
-            if (npc != null) {
-                npc.update();
-                NMSImpl.minecartItemLogic(this);
-            }
-        }
-
         @Override
         public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
@@ -65,13 +55,6 @@ public class MinecartCommandController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
@@ -106,6 +89,15 @@ public class MinecartCommandController extends MobEntityController {
         public NPC getNPC() {
             return npc;
         }
+
+        @Override
+        public void tick() {
+            super.tick();
+            if (npc != null) {
+                npc.update();
+                NMSImpl.minecartItemLogic(this);
+            }
+        }
     }
 
     public static class MinecartCommandNPC extends CraftMinecartCommand implements NPCHolder {
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java
index 1bd22d065..197fef189 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R2.DamageSource;
 import net.minecraft.server.v1_13_R2.EntityMinecartFurnace;
 import net.minecraft.server.v1_13_R2.NBTTagCompound;
 import net.minecraft.server.v1_13_R2.World;
@@ -41,15 +40,6 @@ public class MinecartFurnaceController extends MobEntityController {
             this.npc = (CitizensNPC) npc;
         }
 
-        @Override
-        public void tick() {
-            super.tick();
-            if (npc != null) {
-                npc.update();
-                NMSImpl.minecartItemLogic(this);
-            }
-        }
-
         @Override
         public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
@@ -65,13 +55,6 @@ public class MinecartFurnaceController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
@@ -106,6 +89,15 @@ public class MinecartFurnaceController extends MobEntityController {
         public NPC getNPC() {
             return npc;
         }
+
+        @Override
+        public void tick() {
+            super.tick();
+            if (npc != null) {
+                npc.update();
+                NMSImpl.minecartItemLogic(this);
+            }
+        }
     }
 
     public static class MinecartFurnaceNPC extends CraftMinecartFurnace implements NPCHolder {
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java
index 9783b1873..8b2c07ace 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R2.DamageSource;
 import net.minecraft.server.v1_13_R2.EntityMinecartHopper;
 import net.minecraft.server.v1_13_R2.NBTTagCompound;
 import net.minecraft.server.v1_13_R2.World;
@@ -37,15 +36,6 @@ public class MinecartHopperController extends MobEntityController {
             this.npc = (CitizensNPC) npc;
         }
 
-        @Override
-        public void tick() {
-            super.tick();
-            if (npc != null) {
-                npc.update();
-                NMSImpl.minecartItemLogic(this);
-            }
-        }
-
         @Override
         public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
@@ -61,13 +51,6 @@ public class MinecartHopperController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
@@ -94,5 +77,14 @@ public class MinecartHopperController extends MobEntityController {
         public NPC getNPC() {
             return npc;
         }
+
+        @Override
+        public void tick() {
+            super.tick();
+            if (npc != null) {
+                npc.update();
+                NMSImpl.minecartItemLogic(this);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java
index 1a11cfbe1..15bc259f0 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R2.DamageSource;
 import net.minecraft.server.v1_13_R2.EntityMinecartRideable;
 import net.minecraft.server.v1_13_R2.NBTTagCompound;
 import net.minecraft.server.v1_13_R2.World;
@@ -41,15 +40,6 @@ public class MinecartRideableController extends MobEntityController {
             this.npc = (CitizensNPC) npc;
         }
 
-        @Override
-        public void tick() {
-            super.tick();
-            if (npc != null) {
-                npc.update();
-                NMSImpl.minecartItemLogic(this);
-            }
-        }
-
         @Override
         public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
@@ -65,13 +55,6 @@ public class MinecartRideableController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
@@ -106,6 +89,15 @@ public class MinecartRideableController extends MobEntityController {
         public NPC getNPC() {
             return npc;
         }
+
+        @Override
+        public void tick() {
+            super.tick();
+            if (npc != null) {
+                npc.update();
+                NMSImpl.minecartItemLogic(this);
+            }
+        }
     }
 
     public static class MinecartRideableNPC extends CraftMinecartRideable implements NPCHolder {
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java
index ddabc9583..01958bb46 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R2.DamageSource;
 import net.minecraft.server.v1_13_R2.EntityMinecartMobSpawner;
 import net.minecraft.server.v1_13_R2.NBTTagCompound;
 import net.minecraft.server.v1_13_R2.World;
@@ -37,15 +36,6 @@ public class MinecartSpawnerController extends MobEntityController {
             this.npc = (CitizensNPC) npc;
         }
 
-        @Override
-        public void tick() {
-            super.tick();
-            if (npc != null) {
-                npc.update();
-                NMSImpl.minecartItemLogic(this);
-            }
-        }
-
         @Override
         public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
@@ -61,13 +51,6 @@ public class MinecartSpawnerController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
@@ -95,5 +78,14 @@ public class MinecartSpawnerController extends MobEntityController {
             return npc;
         }
 
+        @Override
+        public void tick() {
+            super.tick();
+            if (npc != null) {
+                npc.update();
+                NMSImpl.minecartItemLogic(this);
+            }
+        }
+
     }
 }
\ No newline at end of file
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java
index 7171115a2..10f5548f0 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R2.DamageSource;
 import net.minecraft.server.v1_13_R2.EntityMinecartTNT;
 import net.minecraft.server.v1_13_R2.NBTTagCompound;
 import net.minecraft.server.v1_13_R2.World;
@@ -37,15 +36,6 @@ public class MinecartTNTController extends MobEntityController {
             this.npc = (CitizensNPC) npc;
         }
 
-        @Override
-        public void tick() {
-            super.tick();
-            if (npc != null) {
-                npc.update();
-                NMSImpl.minecartItemLogic(this);
-            }
-        }
-
         @Override
         public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
@@ -61,13 +51,6 @@ public class MinecartTNTController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
@@ -94,5 +77,14 @@ public class MinecartTNTController extends MobEntityController {
         public NPC getNPC() {
             return npc;
         }
+
+        @Override
+        public void tick() {
+            super.tick();
+            if (npc != null) {
+                npc.update();
+                NMSImpl.minecartItemLogic(this);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java
index 1137f5e0f..69ab08889 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java
@@ -14,7 +14,6 @@ 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;
-import net.minecraft.server.v1_14_R1.DamageSource;
 import net.minecraft.server.v1_14_R1.EntityMinecartChest;
 import net.minecraft.server.v1_14_R1.EntityTypes;
 import net.minecraft.server.v1_14_R1.NBTTagCompound;
@@ -57,13 +56,6 @@ public class MinecartChestController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java
index 7fa7fc631..00d6230c9 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java
@@ -14,7 +14,6 @@ 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;
-import net.minecraft.server.v1_14_R1.DamageSource;
 import net.minecraft.server.v1_14_R1.EntityMinecartCommandBlock;
 import net.minecraft.server.v1_14_R1.EntityTypes;
 import net.minecraft.server.v1_14_R1.NBTTagCompound;
@@ -57,13 +56,6 @@ public class MinecartCommandController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java
index 9f5b6c899..49255a025 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java
@@ -14,7 +14,6 @@ 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;
-import net.minecraft.server.v1_14_R1.DamageSource;
 import net.minecraft.server.v1_14_R1.EntityMinecartFurnace;
 import net.minecraft.server.v1_14_R1.EntityTypes;
 import net.minecraft.server.v1_14_R1.NBTTagCompound;
@@ -57,13 +56,6 @@ public class MinecartFurnaceController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartHopperController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartHopperController.java
index 496609369..5cba99ac3 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartHopperController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartHopperController.java
@@ -10,7 +10,6 @@ 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;
-import net.minecraft.server.v1_14_R1.DamageSource;
 import net.minecraft.server.v1_14_R1.EntityMinecartHopper;
 import net.minecraft.server.v1_14_R1.EntityTypes;
 import net.minecraft.server.v1_14_R1.NBTTagCompound;
@@ -53,13 +52,6 @@ public class MinecartHopperController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java
index 512411303..69dc0d30e 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java
@@ -14,7 +14,6 @@ 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;
-import net.minecraft.server.v1_14_R1.DamageSource;
 import net.minecraft.server.v1_14_R1.EntityMinecartRideable;
 import net.minecraft.server.v1_14_R1.EntityTypes;
 import net.minecraft.server.v1_14_R1.NBTTagCompound;
@@ -57,13 +56,6 @@ public class MinecartRideableController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartSpawnerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartSpawnerController.java
index edbb39bfa..15c6d2cbd 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartSpawnerController.java
@@ -10,7 +10,6 @@ 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;
-import net.minecraft.server.v1_14_R1.DamageSource;
 import net.minecraft.server.v1_14_R1.EntityMinecartMobSpawner;
 import net.minecraft.server.v1_14_R1.EntityTypes;
 import net.minecraft.server.v1_14_R1.NBTTagCompound;
@@ -53,13 +52,6 @@ public class MinecartSpawnerController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartTNTController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartTNTController.java
index 21796b940..d8a1c6c34 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartTNTController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartTNTController.java
@@ -10,7 +10,6 @@ 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;
-import net.minecraft.server.v1_14_R1.DamageSource;
 import net.minecraft.server.v1_14_R1.EntityMinecartTNT;
 import net.minecraft.server.v1_14_R1.EntityTypes;
 import net.minecraft.server.v1_14_R1.NBTTagCompound;
@@ -53,13 +52,6 @@ public class MinecartTNTController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void f(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java
index 872b74dd2..7daba2216 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_15_R1.DamageSource;
 import net.minecraft.server.v1_15_R1.EntityMinecartChest;
 import net.minecraft.server.v1_15_R1.EntityTypes;
 import net.minecraft.server.v1_15_R1.NBTTagCompound;
@@ -58,10 +57,16 @@ public class MinecartChestController extends MobEntityController {
         }
 
         @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
+        public CraftEntity getBukkitEntity() {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
+                NMSImpl.setBukkitEntity(this, new MinecartChestNPC(this));
+            }
+            return super.getBukkitEntity();
+        }
+
+        @Override
+        public NPC getNPC() {
+            return npc;
         }
 
         @Override
@@ -86,19 +91,6 @@ public class MinecartChestController extends MobEntityController {
             // cancelled.
         }
 
-        @Override
-        public CraftEntity getBukkitEntity() {
-            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                NMSImpl.setBukkitEntity(this, new MinecartChestNPC(this));
-            }
-            return super.getBukkitEntity();
-        }
-
-        @Override
-        public NPC getNPC() {
-            return npc;
-        }
-
         @Override
         public void tick() {
             super.tick();
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java
index c18d47e9e..536c52cf6 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_15_R1.DamageSource;
 import net.minecraft.server.v1_15_R1.EntityMinecartCommandBlock;
 import net.minecraft.server.v1_15_R1.EntityTypes;
 import net.minecraft.server.v1_15_R1.NBTTagCompound;
@@ -58,10 +57,16 @@ public class MinecartCommandController extends MobEntityController {
         }
 
         @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
+        public CraftEntity getBukkitEntity() {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
+                NMSImpl.setBukkitEntity(this, new MinecartCommandNPC(this));
+            }
+            return super.getBukkitEntity();
+        }
+
+        @Override
+        public NPC getNPC() {
+            return npc;
         }
 
         @Override
@@ -86,19 +91,6 @@ public class MinecartCommandController extends MobEntityController {
             // cancelled.
         }
 
-        @Override
-        public CraftEntity getBukkitEntity() {
-            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                NMSImpl.setBukkitEntity(this, new MinecartCommandNPC(this));
-            }
-            return super.getBukkitEntity();
-        }
-
-        @Override
-        public NPC getNPC() {
-            return npc;
-        }
-
         @Override
         public void tick() {
             super.tick();
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java
index 85c6b3a42..348b20d0f 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_15_R1.DamageSource;
 import net.minecraft.server.v1_15_R1.EntityMinecartFurnace;
 import net.minecraft.server.v1_15_R1.EntityTypes;
 import net.minecraft.server.v1_15_R1.NBTTagCompound;
@@ -58,10 +57,16 @@ public class MinecartFurnaceController extends MobEntityController {
         }
 
         @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
+        public CraftEntity getBukkitEntity() {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
+                NMSImpl.setBukkitEntity(this, new MinecartFurnaceNPC(this));
+            }
+            return super.getBukkitEntity();
+        }
+
+        @Override
+        public NPC getNPC() {
+            return npc;
         }
 
         @Override
@@ -86,19 +91,6 @@ public class MinecartFurnaceController extends MobEntityController {
             // cancelled.
         }
 
-        @Override
-        public CraftEntity getBukkitEntity() {
-            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                NMSImpl.setBukkitEntity(this, new MinecartFurnaceNPC(this));
-            }
-            return super.getBukkitEntity();
-        }
-
-        @Override
-        public NPC getNPC() {
-            return npc;
-        }
-
         @Override
         public void tick() {
             super.tick();
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartHopperController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartHopperController.java
index c48da5259..c7ca7889f 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartHopperController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartHopperController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_15_R1.DamageSource;
 import net.minecraft.server.v1_15_R1.EntityMinecartHopper;
 import net.minecraft.server.v1_15_R1.EntityTypes;
 import net.minecraft.server.v1_15_R1.NBTTagCompound;
@@ -54,10 +53,8 @@ public class MinecartHopperController extends MobEntityController {
         }
 
         @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
+        public NPC getNPC() {
+            return npc;
         }
 
         @Override
@@ -82,11 +79,6 @@ public class MinecartHopperController extends MobEntityController {
             // cancelled.
         }
 
-        @Override
-        public NPC getNPC() {
-            return npc;
-        }
-
         @Override
         public void tick() {
             super.tick();
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java
index 1610a80a0..2d2f7f87f 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_15_R1.DamageSource;
 import net.minecraft.server.v1_15_R1.EntityMinecartRideable;
 import net.minecraft.server.v1_15_R1.EntityTypes;
 import net.minecraft.server.v1_15_R1.NBTTagCompound;
@@ -58,10 +57,16 @@ public class MinecartRideableController extends MobEntityController {
         }
 
         @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
+        public CraftEntity getBukkitEntity() {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
+                NMSImpl.setBukkitEntity(this, new MinecartRideableNPC(this));
+            }
+            return super.getBukkitEntity();
+        }
+
+        @Override
+        public NPC getNPC() {
+            return npc;
         }
 
         @Override
@@ -86,19 +91,6 @@ public class MinecartRideableController extends MobEntityController {
             // cancelled.
         }
 
-        @Override
-        public CraftEntity getBukkitEntity() {
-            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                NMSImpl.setBukkitEntity(this, new MinecartRideableNPC(this));
-            }
-            return super.getBukkitEntity();
-        }
-
-        @Override
-        public NPC getNPC() {
-            return npc;
-        }
-
         @Override
         public void tick() {
             super.tick();
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartSpawnerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartSpawnerController.java
index 3c2c0c3ab..43d0e4348 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartSpawnerController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_15_R1.DamageSource;
 import net.minecraft.server.v1_15_R1.EntityMinecartMobSpawner;
 import net.minecraft.server.v1_15_R1.EntityTypes;
 import net.minecraft.server.v1_15_R1.NBTTagCompound;
@@ -54,10 +53,8 @@ public class MinecartSpawnerController extends MobEntityController {
         }
 
         @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
+        public NPC getNPC() {
+            return npc;
         }
 
         @Override
@@ -82,11 +79,6 @@ public class MinecartSpawnerController extends MobEntityController {
             // cancelled.
         }
 
-        @Override
-        public NPC getNPC() {
-            return npc;
-        }
-
         @Override
         public void tick() {
             super.tick();
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartTNTController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartTNTController.java
index 56a3539bf..f34978cfd 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartTNTController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartTNTController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_15_R1.DamageSource;
 import net.minecraft.server.v1_15_R1.EntityMinecartTNT;
 import net.minecraft.server.v1_15_R1.EntityTypes;
 import net.minecraft.server.v1_15_R1.NBTTagCompound;
@@ -54,10 +53,8 @@ public class MinecartTNTController extends MobEntityController {
         }
 
         @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
+        public NPC getNPC() {
+            return npc;
         }
 
         @Override
@@ -82,11 +79,6 @@ public class MinecartTNTController extends MobEntityController {
             // cancelled.
         }
 
-        @Override
-        public NPC getNPC() {
-            return npc;
-        }
-
         @Override
         public void tick() {
             super.tick();
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartChestController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartChestController.java
index 2f4606803..48bbd9378 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartChestController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartChestController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_8_R3.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_8_R3.DamageSource;
 import net.minecraft.server.v1_8_R3.EntityMinecartChest;
 import net.minecraft.server.v1_8_R3.NBTTagCompound;
 import net.minecraft.server.v1_8_R3.World;
@@ -56,13 +55,6 @@ public class MinecartChestController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void g(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartCommandController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartCommandController.java
index 0d6afbdb2..e0822e090 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartCommandController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartCommandController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_8_R3.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_8_R3.DamageSource;
 import net.minecraft.server.v1_8_R3.EntityMinecartCommandBlock;
 import net.minecraft.server.v1_8_R3.NBTTagCompound;
 import net.minecraft.server.v1_8_R3.World;
@@ -56,13 +55,6 @@ public class MinecartCommandController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void g(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartFurnaceController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartFurnaceController.java
index 75dca6952..39b0c1740 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartFurnaceController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_8_R3.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_8_R3.DamageSource;
 import net.minecraft.server.v1_8_R3.EntityMinecartFurnace;
 import net.minecraft.server.v1_8_R3.NBTTagCompound;
 import net.minecraft.server.v1_8_R3.World;
@@ -56,13 +55,6 @@ public class MinecartFurnaceController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void g(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartHopperController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartHopperController.java
index ac5aa25fa..a575351da 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartHopperController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartHopperController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_8_R3.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_8_R3.DamageSource;
 import net.minecraft.server.v1_8_R3.EntityMinecartHopper;
 import net.minecraft.server.v1_8_R3.NBTTagCompound;
 import net.minecraft.server.v1_8_R3.World;
@@ -52,13 +51,6 @@ public class MinecartHopperController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void g(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartRideableController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartRideableController.java
index eac20393e..91731a667 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartRideableController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartRideableController.java
@@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_8_R3.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_8_R3.DamageSource;
 import net.minecraft.server.v1_8_R3.EntityMinecartRideable;
 import net.minecraft.server.v1_8_R3.NBTTagCompound;
 import net.minecraft.server.v1_8_R3.World;
@@ -56,13 +55,6 @@ public class MinecartRideableController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void g(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartSpawnerController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartSpawnerController.java
index 6747e61b2..a58068e84 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartSpawnerController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_8_R3.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_8_R3.DamageSource;
 import net.minecraft.server.v1_8_R3.EntityMinecartMobSpawner;
 import net.minecraft.server.v1_8_R3.NBTTagCompound;
 import net.minecraft.server.v1_8_R3.World;
@@ -52,13 +51,6 @@ public class MinecartSpawnerController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void g(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartTNTController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartTNTController.java
index 81e68cbf0..ee81a27e1 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartTNTController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartTNTController.java
@@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_8_R3.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_8_R3.DamageSource;
 import net.minecraft.server.v1_8_R3.EntityMinecartTNT;
 import net.minecraft.server.v1_8_R3.NBTTagCompound;
 import net.minecraft.server.v1_8_R3.World;
@@ -52,13 +51,6 @@ public class MinecartTNTController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
-        @Override
-        public boolean damageEntity(DamageSource damagesource, float f) {
-            if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                return super.damageEntity(damagesource, f);
-            return false;
-        }
-
         @Override
         public void g(double x, double y, double z) {
             if (npc == null) {
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerlistTrackerEntry.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerlistTrackerEntry.java
index ded766a92..cfae19993 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerlistTrackerEntry.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerlistTrackerEntry.java
@@ -31,7 +31,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                     && ((entityplayer.u().getPlayerChunkMap().a(entityplayer, tracker.ae, tracker.ag))
                             || (tracker.attachedToPlayer))) {
                 if ((tracker instanceof SkinnableEntity)) {
-
                     SkinnableEntity skinnable = (SkinnableEntity) tracker;
 
                     Player player = skinnable.getBukkitEntity();