Fixed VEHICLE_MOVE

2 files changed, 11 insertions, 9 deletions

diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index 67923166..b9a53712 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -324,13 +324,14 @@ public class EntityBoat extends Entity {
             // CraftBukkit start
             CraftServer server = ((WorldServer) this.world).getServer();
             CraftWorld world = ((WorldServer) this.world).getWorld();
-            Type eventType = Type.VEHICLE_MOVE;
-            Vehicle vehicle = (Vehicle) this.getBukkitEntity();
             Location from = new Location(world, prevX, prevY, prevZ, prevYaw, prevPitch);
             Location to = new Location(world, this.locX, this.locY, this.locZ, this.yaw, this.pitch);
+            if (!from.equals(to)) {
+                Vehicle vehicle = (Vehicle) this.getBukkitEntity();
 
-            VehicleMoveEvent event = new VehicleMoveEvent(eventType, vehicle, from, to);
-            server.getPluginManager().callEvent(event);
+                VehicleMoveEvent event = new VehicleMoveEvent(Type.VEHICLE_MOVE, vehicle, from, to);
+                server.getPluginManager().callEvent(event);
+            }
             // CraftBukkit end
 
             List list = this.world.b((Entity) this, this.boundingBox.b(0.20000000298023224D, 0.0D, 0.20000000298023224D));
diff --git a/src/main/java/net/minecraft/server/EntityMinecart.java b/src/main/java/net/minecraft/server/EntityMinecart.java
index c328fd8c..89e86ac1 100644
--- a/src/main/java/net/minecraft/server/EntityMinecart.java
+++ b/src/main/java/net/minecraft/server/EntityMinecart.java
@@ -480,16 +480,17 @@ public class EntityMinecart extends Entity implements IInventory {
 
             this.b(this.yaw, this.pitch);
 
-            // CraftBukkit start
+             // CraftBukkit start
             CraftServer server = ((WorldServer) this.world).getServer();
             CraftWorld world = ((WorldServer) this.world).getWorld();
-            Type eventType = Type.VEHICLE_MOVE;
-            Vehicle vehicle = (Vehicle) this.getBukkitEntity();
             Location from = new Location(world, prevX, prevY, prevZ, prevYaw, prevPitch);
             Location to = new Location(world, this.locX, this.locY, this.locZ, this.yaw, this.pitch);
+            if (!from.equals(to)) {
+                Vehicle vehicle = (Vehicle) this.getBukkitEntity();
 
-            VehicleMoveEvent event = new VehicleMoveEvent(eventType , vehicle , from, to);
-            server.getPluginManager().callEvent(event);
+                VehicleMoveEvent event = new VehicleMoveEvent(Type.VEHICLE_MOVE, vehicle, from, to);
+                server.getPluginManager().callEvent(event);
+            }
             // CraftBukkit end
 
             List list = this.world.b((Entity) this, this.boundingBox.b(0.20000000298023224D, 0.0D, 0.20000000298023224D));