Use collision vector from event

src/main/java/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java

@@ -63,9 +63,12 @@ public class CitizensBlazeNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java

@@ -65,9 +65,12 @@ public class CitizensCaveSpiderNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensChickenNPC.java

@@ -62,9 +62,12 @@ public class CitizensChickenNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensCowNPC.java

@@ -62,9 +62,12 @@ public class CitizensCowNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java

@@ -69,12 +69,15 @@ public class CitizensCreeperNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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
+            // NPC so we prevent it from doing anything if the event is
-            // so we prevent it from doing anything if the event is cancelled.
+            // cancelled.
         }
 
         @Override

src/main/java/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java

@@ -65,9 +65,12 @@ public class CitizensEnderDragonNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java

@@ -115,9 +115,12 @@ public class CitizensEndermanNPC extends CitizensMobNPC implements Equipable {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensGhastNPC.java

@@ -63,9 +63,12 @@ public class CitizensGhastNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensGiantNPC.java

@@ -59,9 +59,12 @@ public class CitizensGiantNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensIronGolemNPC.java

@@ -58,9 +58,12 @@ public class CitizensIronGolemNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java

@@ -71,9 +71,12 @@ public class CitizensMagmaCubeNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java

@@ -62,9 +62,12 @@ public class CitizensMushroomCowNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensOcelotNPC.java

@@ -62,9 +62,12 @@ public class CitizensOcelotNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensPigNPC.java

@@ -95,9 +95,12 @@ public class CitizensPigNPC extends CitizensMobNPC implements Equipable {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java

@@ -70,9 +70,12 @@ public class CitizensPigZombieNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensSheepNPC.java

@@ -100,9 +100,12 @@ public class CitizensSheepNPC extends CitizensMobNPC implements Equipable {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java

@@ -70,9 +70,12 @@ public class CitizensSilverfishNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java

@@ -62,9 +62,12 @@ public class CitizensSkeletonNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java

@@ -71,9 +71,12 @@ public class CitizensSlimeNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java

@@ -57,9 +57,12 @@ public class CitizensSnowmanNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java

@@ -69,9 +69,12 @@ public class CitizensSpiderNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensSquidNPC.java

@@ -63,9 +63,12 @@ public class CitizensSquidNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java

@@ -70,9 +70,12 @@ public class CitizensVillagerNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensWolfNPC.java

@@ -62,9 +62,12 @@ public class CitizensWolfNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/CitizensZombieNPC.java

@@ -62,9 +62,12 @@ public class CitizensZombieNPC extends CitizensMobNPC {
             }
             if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
                 return;
-            NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+            Vector vector = new Vector(x, y, z);
-            if (!event.isCancelled())
+            NPCPushEvent event = Util.callPushEvent(npc, vector);
-                super.g(x, y, z);
+            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.

src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java

@@ -63,11 +63,15 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
         }
         if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
             return;
-        NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
+        Vector vector = new Vector(x, y, z);
-        if (!event.isCancelled())
+        NPCPushEvent event = Util.callPushEvent(npc, vector);
-            super.g(x, y, z);
+        if (!event.isCancelled()) {
-        // when another entity collides, this method is called to push the NPC
+            vector = event.getCollisionVector();
-        // so we prevent it from doing anything if the event is cancelled.
+            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