Reduce jar size by refactoring push event

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Bat;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -97,24 +96,10 @@ public class BatController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Blaze;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -96,24 +95,10 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.CaveSpider;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -112,24 +111,10 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Chicken;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -123,24 +122,10 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Cow;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -139,24 +138,10 @@ public class CowController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Creeper;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -123,25 +122,10 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
-                    super.g(x, y, z);
-                }
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.EnderDragon;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -95,24 +94,10 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Enderman;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -111,24 +110,10 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Endermite;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -111,24 +110,10 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -20,7 +20,6 @@ import com.mojang.authlib.GameProfile;
 import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.trait.trait.Inventory;
 import net.citizensnpcs.nms.v1_10_R1.network.EmptyNetHandler;
@@ -173,25 +172,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public void g(double x, double y, double z) {
-        if (npc == null) {
+        Vector vector = Util.callPushEvent(npc, x, y, z);
-            super.g(x, y, z);
+        if (vector != null) {
-            return;
-        }
-        if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-            if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
-                super.g(x, y, z);
-            }
-            return;
-        }
-        Vector vector = new Vector(x, y, z);
-        NPCPushEvent event = Util.callPushEvent(npc, vector);
-        if (!event.isCancelled()) {
-            vector = event.getCollisionVector();
             super.g(vector.getX(), vector.getY(), vector.getZ());
         }
-        // when another entity collides, this method is called to push the
-        // NPC so we prevent it from doing anything if the event is
-        // cancelled.
     }
 
     @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Ghast;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -87,24 +86,10 @@ public class GhastController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Giant;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -97,24 +96,10 @@ public class GiantController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Guardian;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -98,24 +97,10 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -9,7 +9,6 @@ import org.bukkit.entity.Horse;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -127,24 +126,10 @@ public class HorseController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.IronGolem;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -97,24 +96,10 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.MagmaCube;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.nms.v1_10_R1.util.PlayerControllerMove;
@@ -108,24 +107,10 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.MushroomCow;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -119,24 +118,10 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Ocelot;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -115,24 +114,10 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Pig;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -118,24 +117,10 @@ public class PigController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.PigZombie;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -98,25 +97,10 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
-                    super.g(x, y, z);
-                }
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.PolarBear;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -93,24 +92,10 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Rabbit;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -110,24 +109,10 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Sheep;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -108,24 +107,10 @@ public class SheepController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Shulker;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -98,24 +97,10 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Silverfish;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -97,24 +96,10 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Skeleton;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -97,24 +96,10 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Slime;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.nms.v1_10_R1.util.PlayerControllerMove;
@@ -109,24 +108,10 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Snowman;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -97,24 +96,10 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Spider;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -97,24 +96,10 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Squid;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -97,24 +96,10 @@ public class SquidController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Villager;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -16,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
 import net.minecraft.server.v1_10_R1.BlockPosition;
 import net.minecraft.server.v1_10_R1.EntityHuman;
+import net.minecraft.server.v1_10_R1.EntityLightning;
 import net.minecraft.server.v1_10_R1.EntityVillager;
 import net.minecraft.server.v1_10_R1.EnumHand;
 import net.minecraft.server.v1_10_R1.IBlockData;
@@ -23,7 +23,6 @@ import net.minecraft.server.v1_10_R1.ItemStack;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.SoundEffect;
 import net.minecraft.server.v1_10_R1.World;
-import net.minecraft.server.v1_10_R1.EntityLightning;
 
 public class VillagerController extends MobEntityController {
     public VillagerController() {
@@ -132,24 +131,10 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Witch;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -97,24 +96,10 @@ public class WitchController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Wither;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -81,24 +80,10 @@ public class WitherController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -9,7 +9,6 @@ import org.bukkit.event.entity.EntityTargetEvent;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -111,24 +110,10 @@ public class WolfController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Zombie;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -97,24 +96,10 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
 import org.bukkit.entity.AreaEffectCloud;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -70,24 +69,10 @@ public class AreaEffectCloudController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -9,7 +9,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
@@ -89,24 +88,10 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
 import org.bukkit.entity.Boat;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
@@ -71,24 +70,10 @@ public class BoatController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
 import org.bukkit.entity.DragonFireball;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
@@ -71,24 +70,10 @@ public class DragonFireballController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -1,16 +1,5 @@
 package net.citizensnpcs.nms.v1_10_R1.entity.nonliving;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
-import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.npc.AbstractEntityController;
-import net.citizensnpcs.npc.CitizensNPC;
-import net.citizensnpcs.npc.ai.NPCHolder;
-import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_10_R1.EntityEgg;
-import net.minecraft.server.v1_10_R1.NBTTagCompound;
-import net.minecraft.server.v1_10_R1.World;
-import net.minecraft.server.v1_10_R1.WorldServer;
-
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
@@ -21,6 +10,16 @@ import org.bukkit.entity.Egg;
 import org.bukkit.entity.Entity;
 import org.bukkit.util.Vector;
 
+import net.citizensnpcs.api.npc.NPC;
+import net.citizensnpcs.npc.AbstractEntityController;
+import net.citizensnpcs.npc.CitizensNPC;
+import net.citizensnpcs.npc.ai.NPCHolder;
+import net.citizensnpcs.util.Util;
+import net.minecraft.server.v1_10_R1.EntityEgg;
+import net.minecraft.server.v1_10_R1.NBTTagCompound;
+import net.minecraft.server.v1_10_R1.World;
+import net.minecraft.server.v1_10_R1.WorldServer;
+
 public class EggController extends AbstractEntityController {
     public EggController() {
         super(EntityEggNPC.class);
@@ -86,24 +85,10 @@ public class EggController extends AbstractEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -1,6 +1,12 @@
 package net.citizensnpcs.nms.v1_10_R1.entity.nonliving;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEnderCrystal;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
+import org.bukkit.entity.EnderCrystal;
+import org.bukkit.util.Vector;
+
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -10,13 +16,6 @@ import net.minecraft.server.v1_10_R1.EntityEnderCrystal;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.World;
 
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEnderCrystal;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
-import org.bukkit.entity.EnderCrystal;
-import org.bukkit.util.Vector;
-
 public class EnderCrystalController extends MobEntityController {
     public EnderCrystalController() {
         super(EntityEnderCrystalNPC.class);
@@ -70,24 +69,10 @@ public class EnderCrystalController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
 import org.bukkit.entity.EnderPearl;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -70,24 +69,10 @@ public class EnderPearlController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -1,6 +1,12 @@
 package net.citizensnpcs.nms.v1_10_R1.entity.nonliving;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEnderSignal;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
+import org.bukkit.entity.EnderSignal;
+import org.bukkit.util.Vector;
+
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -10,13 +16,6 @@ import net.minecraft.server.v1_10_R1.EntityEnderSignal;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.World;
 
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEnderSignal;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
-import org.bukkit.entity.EnderSignal;
-import org.bukkit.util.Vector;
-
 public class EnderSignalController extends MobEntityController {
     public EnderSignalController() {
         super(EntityEnderSignalNPC.class);
@@ -70,24 +69,10 @@ public class EnderSignalController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -1,6 +1,12 @@
 package net.citizensnpcs.nms.v1_10_R1.entity.nonliving;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftExperienceOrb;
+import org.bukkit.entity.ExperienceOrb;
+import org.bukkit.util.Vector;
+
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -10,13 +16,6 @@ import net.minecraft.server.v1_10_R1.EntityExperienceOrb;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.World;
 
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftExperienceOrb;
-import org.bukkit.entity.ExperienceOrb;
-import org.bukkit.util.Vector;
-
 public class ExperienceOrbController extends MobEntityController {
     public ExperienceOrbController() {
         super(EntityExperienceOrbNPC.class);
@@ -56,24 +55,10 @@ public class ExperienceOrbController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -13,7 +13,6 @@ import org.bukkit.entity.FallingBlock;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.DespawnReason;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.event.SpawnReason;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
@@ -87,24 +86,10 @@ public class FallingBlockController extends AbstractEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -1,6 +1,12 @@
 package net.citizensnpcs.nms.v1_10_R1.entity.nonliving;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftFirework;
+import org.bukkit.entity.Firework;
+import org.bukkit.util.Vector;
+
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -10,13 +16,6 @@ import net.minecraft.server.v1_10_R1.EntityFireworks;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.World;
 
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftFirework;
-import org.bukkit.entity.Firework;
-import org.bukkit.util.Vector;
-
 public class FireworkController extends MobEntityController {
     public FireworkController() {
         super(EntityFireworkNPC.class);
@@ -56,24 +55,10 @@ public class FireworkController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_10_R1.entity.CraftFish;
 import org.bukkit.entity.FishHook;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -56,24 +55,10 @@ public class FishingHookController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -13,7 +13,6 @@ import org.bukkit.entity.Item;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.DespawnReason;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.event.SpawnReason;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.npc.AbstractEntityController;
@@ -87,24 +86,10 @@ public class ItemController extends AbstractEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -11,7 +11,6 @@ import org.bukkit.entity.ItemFrame;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.DespawnReason;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.event.SpawnReason;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
@@ -72,24 +71,10 @@ public class ItemFrameController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_10_R1.entity.CraftLargeFireball;
 import org.bukkit.entity.LargeFireball;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
@@ -57,24 +56,10 @@ public class LargeFireballController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -1,6 +1,12 @@
 package net.citizensnpcs.nms.v1_10_R1.entity.nonliving;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftLeash;
+import org.bukkit.entity.LeashHitch;
+import org.bukkit.util.Vector;
+
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -10,13 +16,6 @@ import net.minecraft.server.v1_10_R1.EntityLeash;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.World;
 
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftLeash;
-import org.bukkit.entity.LeashHitch;
-import org.bukkit.util.Vector;
-
 public class LeashController extends MobEntityController {
     public LeashController() {
         super(EntityLeashNPC.class);
@@ -56,24 +55,10 @@ public class LeashController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_10_R1.entity.CraftMinecartChest;
 import org.bukkit.entity.Minecart;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
@@ -57,24 +56,10 @@ public class MinecartChestController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_10_R1.entity.CraftMinecartCommand;
 import org.bukkit.entity.Minecart;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
@@ -57,24 +56,10 @@ public class MinecartCommandController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_10_R1.entity.CraftMinecartFurnace;
 import org.bukkit.entity.Minecart;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
@@ -57,24 +56,10 @@ public class MinecartFurnaceController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java

@@ -3,7 +3,6 @@ package net.citizensnpcs.nms.v1_10_R1.entity.nonliving;
 import org.bukkit.entity.Minecart;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
@@ -53,24 +52,10 @@ public class MinecartHopperController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_10_R1.entity.CraftMinecartRideable;
 import org.bukkit.entity.Minecart;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
@@ -57,24 +56,10 @@ public class MinecartRideableController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java

@@ -3,7 +3,6 @@ package net.citizensnpcs.nms.v1_10_R1.entity.nonliving;
 import org.bukkit.entity.Minecart;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
@@ -53,24 +52,10 @@ public class MinecartSpawnerController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java

@@ -3,7 +3,6 @@ package net.citizensnpcs.nms.v1_10_R1.entity.nonliving;
 import org.bukkit.entity.Minecart;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
@@ -53,24 +52,10 @@ public class MinecartTNTController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -1,6 +1,12 @@
 package net.citizensnpcs.nms.v1_10_R1.entity.nonliving;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPainting;
+import org.bukkit.entity.Painting;
+import org.bukkit.util.Vector;
+
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -10,13 +16,6 @@ import net.minecraft.server.v1_10_R1.EntityPainting;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.World;
 
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPainting;
-import org.bukkit.entity.Painting;
-import org.bukkit.util.Vector;
-
 public class PaintingController extends MobEntityController {
     public PaintingController() {
         super(EntityPaintingNPC.class);
@@ -56,24 +55,10 @@ public class PaintingController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_10_R1.entity.CraftShulkerBullet;
 import org.bukkit.entity.ShulkerBullet;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -56,24 +55,10 @@ public class ShulkerBulletController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_10_R1.entity.CraftSmallFireball;
 import org.bukkit.entity.SmallFireball;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -56,24 +55,10 @@ public class SmallFireballController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -1,6 +1,12 @@
 package net.citizensnpcs.nms.v1_10_R1.entity.nonliving;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftSnowball;
+import org.bukkit.entity.Snowball;
+import org.bukkit.util.Vector;
+
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -10,13 +16,6 @@ import net.minecraft.server.v1_10_R1.EntitySnowball;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.World;
 
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftSnowball;
-import org.bukkit.entity.Snowball;
-import org.bukkit.util.Vector;
-
 public class SnowballController extends MobEntityController {
     public SnowballController() {
         super(EntitySnowballNPC.class);
@@ -70,24 +69,10 @@ public class SnowballController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
 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_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -56,24 +55,10 @@ public class SpectralArrowController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -1,6 +1,12 @@
 package net.citizensnpcs.nms.v1_10_R1.entity.nonliving;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftTNTPrimed;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.util.Vector;
+
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -10,13 +16,6 @@ import net.minecraft.server.v1_10_R1.EntityTNTPrimed;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.World;
 
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftTNTPrimed;
-import org.bukkit.entity.TNTPrimed;
-import org.bukkit.util.Vector;
-
 public class TNTPrimedController extends MobEntityController {
     public TNTPrimedController() {
         super(EntityTNTPrimedNPC.class);
@@ -56,24 +55,10 @@ public class TNTPrimedController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_10_R1.entity.CraftThrownExpBottle;
 import org.bukkit.entity.ThrownExpBottle;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -56,24 +55,10 @@ public class ThrownExpBottleController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_10_R1.entity.CraftLingeringPotion;
 import org.bukkit.entity.ThrownPotion;
 import org.bukkit.util.Vector;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -57,24 +56,10 @@ public class ThrownPotionController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_10_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_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -56,24 +55,10 @@ public class TippedArrowController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -1,6 +1,12 @@
 package net.citizensnpcs.nms.v1_10_R1.entity.nonliving;
 
-import net.citizensnpcs.api.event.NPCPushEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftWitherSkull;
+import org.bukkit.entity.WitherSkull;
+import org.bukkit.util.Vector;
+
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -10,13 +16,6 @@ import net.minecraft.server.v1_10_R1.EntityWitherSkull;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 import net.minecraft.server.v1_10_R1.World;
 
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftWitherSkull;
-import org.bukkit.entity.WitherSkull;
-import org.bukkit.util.Vector;
-
 public class WitherSkullController extends MobEntityController {
     public WitherSkullController() {
         super(EntityWitherSkullNPC.class);
@@ -56,24 +55,10 @@ public class WitherSkullController extends MobEntityController {
 
         @Override
         public void g(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.g(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.g(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Bat;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -97,24 +96,10 @@ public class BatController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Blaze;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -96,24 +95,10 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.CaveSpider;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -112,24 +111,10 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Chicken;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -123,24 +122,10 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Cow;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -139,24 +138,10 @@ public class CowController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Creeper;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -113,25 +112,10 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
-                    super.f(x, y, z);
-                }
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.EnderDragon;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -95,24 +94,10 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Enderman;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -111,24 +110,10 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Endermite;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -111,24 +110,10 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -20,7 +20,6 @@ import com.mojang.authlib.GameProfile;
 import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.trait.trait.Inventory;
 import net.citizensnpcs.nms.v1_11_R1.network.EmptyNetHandler;
@@ -196,25 +195,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public void f(double x, double y, double z) {
-        if (npc == null) {
+        Vector vector = Util.callPushEvent(npc, x, y, z);
-            super.f(x, y, z);
+        if (vector != null) {
-            return;
-        }
-        if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-            if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
-                super.f(x, y, z);
-            }
-            return;
-        }
-        Vector vector = new Vector(x, y, z);
-        NPCPushEvent event = Util.callPushEvent(npc, vector);
-        if (!event.isCancelled()) {
-            vector = event.getCollisionVector();
             super.f(vector.getX(), vector.getY(), vector.getZ());
         }
-        // when another entity collides, this method is called to push the
-        // NPC so we prevent it from doing anything if the event is
-        // cancelled.
     }
 
     @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Evoker;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -98,24 +97,10 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Ghast;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -87,24 +86,10 @@ public class GhastController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Giant;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -97,24 +96,10 @@ public class GiantController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Guardian;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -98,24 +97,10 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.ElderGuardian;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -98,24 +97,10 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -9,7 +9,6 @@ import org.bukkit.entity.Horse;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -119,24 +118,10 @@ public class HorseController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -9,7 +9,6 @@ import org.bukkit.entity.Donkey;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -119,24 +118,10 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -9,7 +9,6 @@ import org.bukkit.entity.Mule;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -119,24 +118,10 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -9,7 +9,6 @@ import org.bukkit.entity.SkeletonHorse;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -120,24 +119,10 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -9,7 +9,6 @@ import org.bukkit.entity.ZombieHorse;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -120,24 +119,10 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.IronGolem;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -97,24 +96,10 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -9,7 +9,6 @@ import org.bukkit.entity.Llama;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -119,24 +118,10 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.MagmaCube;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.nms.v1_11_R1.util.PlayerControllerMove;
@@ -116,24 +115,10 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.MushroomCow;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -118,24 +117,10 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Ocelot;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -115,24 +114,10 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Pig;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -116,24 +115,10 @@ public class PigController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.PigZombie;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -98,25 +97,10 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
-                    super.f(x, y, z);
-                }
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.PolarBear;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -93,24 +92,10 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Rabbit;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -110,24 +109,10 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Sheep;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -108,24 +107,10 @@ public class SheepController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -9,7 +9,6 @@ import org.bukkit.entity.Shulker;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -108,24 +107,10 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import org.bukkit.entity.Silverfish;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
-import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -97,24 +96,10 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public void f(double x, double y, double z) {
-            if (npc == null) {
+            Vector vector = Util.callPushEvent(npc, x, y, z);
-                super.f(x, y, z);
+            if (vector != null) {
-                return;
-            }
-            if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-                if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
-                    super.f(x, y, z);
-                return;
-            }
-            Vector vector = new Vector(x, y, z);
-            NPCPushEvent event = Util.callPushEvent(npc, vector);
-            if (!event.isCancelled()) {
-                vector = event.getCollisionVector();
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-            // when another entity collides, this method is called to push the
-            // NPC so we prevent it from doing anything if the event is
-            // cancelled.
         }
 
         @Override