2 files changed, 12 insertions, 40 deletions
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index 9bb96e21..c5bd46be 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -4,8 +4,6 @@ import java.util.List;
 
 // CraftBukkit start
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.entity.CraftBoat;
-import org.bukkit.craftbukkit.entity.CraftEntity;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.entity.Vehicle;
@@ -31,14 +29,6 @@ public class EntityBoat extends Entity {
     private double am;
 
     // CraftBukkit start
-    private void handleCreation(World world) {
-        CraftServer server = ((WorldServer) world).getServer();
-        Type eventType = Type.VEHICLE_CREATE;
-        Vehicle vehicle = (Vehicle) this.getBukkitEntity();
-        VehicleCreateEvent event = new VehicleCreateEvent(eventType, vehicle);
-        server.getPluginManager().callEvent(event);
-    }
-
     public void c(Entity entity) {
         CraftServer server = ((WorldServer) this.world).getServer();
         Type eventType = Type.VEHICLE_COLLISION_ENTITY;
@@ -91,7 +81,13 @@ public class EntityBoat extends Entity {
         this.lastY = d1;
         this.lastZ = d2;
 
-        handleCreation(world); // CraftBukkit
+        // CraftBukkit start
+        CraftServer server = ((WorldServer) world).getServer();
+        Type eventType = Type.VEHICLE_CREATE;
+        Vehicle vehicle = (Vehicle) this.getBukkitEntity();
+        VehicleCreateEvent event = new VehicleCreateEvent(eventType, vehicle);
+        server.getPluginManager().callEvent(event);
+        // CraftBukkit end
     }
 
     public double k() {
diff --git a/src/main/java/net/minecraft/server/EntityMinecart.java b/src/main/java/net/minecraft/server/EntityMinecart.java
index e9db574a..5cbc07b6 100644
--- a/src/main/java/net/minecraft/server/EntityMinecart.java
+++ b/src/main/java/net/minecraft/server/EntityMinecart.java
@@ -4,12 +4,7 @@ import java.util.List;
 
 // CraftBukkit start
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.entity.CraftEntity;
-import org.bukkit.craftbukkit.entity.CraftPoweredMinecart;
-import org.bukkit.craftbukkit.entity.CraftStorageMinecart;
-import org.bukkit.craftbukkit.CraftMappable;
 import org.bukkit.craftbukkit.CraftWorld;
-import org.bukkit.craftbukkit.entity.CraftMinecart;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Vehicle;
 import org.bukkit.event.Event.Type;
@@ -50,26 +45,6 @@ public class EntityMinecart extends Entity implements IInventory {
     public ItemStack[] getContents() {
         return this.al;
     }
-
-    private void handleCreation(World world) {
-        CraftServer server = ((WorldServer) world).getServer();
-        Type eventType = Type.VEHICLE_CREATE;
-        Vehicle vehicle = (Vehicle) this.getBukkitEntity();
-
-        VehicleCreateEvent event = new VehicleCreateEvent(eventType, vehicle);
-        server.getPluginManager().callEvent(event);
-    }
-
-    @Override
-    public org.bukkit.entity.Entity getBukkitEntity(){
-        if (this.d == CraftMinecart.Type.StorageMinecart.getId()) {
-            return this.bukkitStorageMinecart;
-        } else if (this.d == CraftMinecart.Type.PoweredMinecart.getId()) {
-            return this.bukkitPoweredMinecart;
-        } else {
-            return this.bukkitEntity;
-        }
-    }
     // CraftBukkit end
 
     public EntityMinecart(World world) {
@@ -86,10 +61,11 @@ public class EntityMinecart extends Entity implements IInventory {
 
         // CraftBukkit start
         CraftServer server = ((WorldServer) this.world).getServer();
-        this.bukkitEntity = new CraftMinecart(server, this);
-        this.bukkitPoweredMinecart = new CraftPoweredMinecart(server, this);
-        this.bukkitStorageMinecart = new CraftStorageMinecart(server, this);
-        handleCreation(world);
+        Type eventType = Type.VEHICLE_CREATE;
+        Vehicle vehicle = (Vehicle) this.getBukkitEntity();
+
+        VehicleCreateEvent event = new VehicleCreateEvent(eventType, vehicle);
+        server.getPluginManager().callEvent(event);
         // CraftBukkit end
     }