diff options
author | Erik Broes <erikbroes@grum.nl> | 2011-02-01 23:52:36 +0100 |
---|---|---|
committer | Erik Broes <erikbroes@grum.nl> | 2011-02-02 00:29:37 +0100 |
commit | 001a45804e24113c1581e0a1b8007e79e82187f6 (patch) | |
tree | 079c5c0baa829b0994d4306575af78e0528e56c9 /src/main/java/net/minecraft/server/EntityMinecart.java | |
parent | 1dac92a7662c408a08a5f420995867352ef40ce5 (diff) | |
download | craftbukkit-001a45804e24113c1581e0a1b8007e79e82187f6.tar craftbukkit-001a45804e24113c1581e0a1b8007e79e82187f6.tar.gz craftbukkit-001a45804e24113c1581e0a1b8007e79e82187f6.tar.lz craftbukkit-001a45804e24113c1581e0a1b8007e79e82187f6.tar.xz craftbukkit-001a45804e24113c1581e0a1b8007e79e82187f6.zip |
Clean vehicle code.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityMinecart.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityMinecart.java | 34 |
1 files changed, 5 insertions, 29 deletions
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 } |