Updated against new mc-dev format, takes out quite some casting troubles at the cost of extra ()'s

1 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java
index dfbd443b..c8c0012b 100644
--- a/src/main/java/net/minecraft/server/ItemMinecart.java
+++ b/src/main/java/net/minecraft/server/ItemMinecart.java
@@ -1,11 +1,12 @@
 package net.minecraft.server;
 
+// CraftBukkit start
 import org.bukkit.craftbukkit.CraftBlock;
 import org.bukkit.craftbukkit.CraftItemStack;
 import org.bukkit.craftbukkit.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.player.PlayerItemEvent;
-
+// CraftBukkit end
 
 public class ItemMinecart extends Item {
 
@@ -21,19 +22,19 @@ public class ItemMinecart extends Item {
         int i1 = world.a(i, j, k);
 
         if (i1 == Block.aG.bh) {
-            // Craftbukkit start
-            // Minecarts
+            // CraftBukkit start - Minecarts
             CraftBlock blockClicked = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i, j, k);
             CraftItemStack itemInHand = new CraftItemStack(itemstack);
             CraftPlayer thePlayer = new CraftPlayer(((WorldServer) world).getServer(), (EntityPlayerMP) entityplayer);
             PlayerItemEvent pie = new PlayerItemEvent(Type.PLAYER_ITEM, thePlayer, itemInHand, blockClicked, CraftBlock.notchToBlockFace(l));
-            
+
             ((WorldServer) world).getServer().getPluginManager().callEvent(pie);
-            
+
             if (pie.isCancelled()) return false;
-            
+            // CraftBukkit end
+
             if (!world.z) {
-                world.a(new EntityMinecart(world, (float) i + 0.5F, (float) j + 0.5F, (float) k + 0.5F, a));
+                world.a(((Entity) (new EntityMinecart(world, (float) i + 0.5F, (float) j + 0.5F, (float) k + 0.5F, a))));
             }
             itemstack.a--;
             return true;
@@ -42,4 +43,3 @@ public class ItemMinecart extends Item {
         }
     }
 }
-