Port to new mc-dev format.

1 files changed, 28 insertions, 26 deletions

diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java
index 7d97e6fc..4da25503 100644
--- a/src/main/java/net/minecraft/server/ItemMinecart.java
+++ b/src/main/java/net/minecraft/server/ItemMinecart.java
@@ -17,36 +17,38 @@ public class ItemMinecart extends Item {
 
     public ItemMinecart(int i, int j) {
         super(i);
-        bb = 1;
-        a = j;
+        this.maxStackSize = 1;
+        this.a = j;
     }
 
-    public boolean a(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) {
-        int i1 = world.a(i, j, k);
-
-        if (i1 == Block.aG.bi) {
-            // CraftBukkit start - Minecarts
-            CraftWorld craftWorld = ((WorldServer) world).getWorld();
-            CraftServer craftServer = ((WorldServer) world).getServer();
-            
-            Type eventType = Type.PLAYER_ITEM;
-            Player who = (entityplayer == null)?null:(Player)entityplayer.getBukkitEntity();
-            org.bukkit.inventory.ItemStack itemInHand = new CraftItemStack(itemstack);
-            org.bukkit.block.Block blockClicked = craftWorld.getBlockAt(i, j, k);
-            BlockFace blockFace = CraftBlock.notchToBlockFace(1);
-            
-            PlayerItemEvent pie = new PlayerItemEvent(eventType, who, itemInHand, blockClicked, blockFace);
-            craftServer.getPluginManager().callEvent(pie);
-            
-            if (pie.isCancelled()) {
-                return false;
-            }
-            // CraftBukkit end
+    public boolean a(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l) {
+        int i1 = world.getTypeId(i, j, k);
+
+        if (i1 == Block.RAILS.id) {
+            if (!world.isStatic) {
+
+                // CraftBukkit start - Minecarts
+                CraftWorld craftWorld = ((WorldServer) world).getWorld();
+                CraftServer craftServer = ((WorldServer) world).getServer();
+
+                Type eventType = Type.PLAYER_ITEM;
+                Player who = (entityhuman == null) ? null : (Player) entityhuman.getBukkitEntity();
+                org.bukkit.inventory.ItemStack itemInHand = new CraftItemStack(itemstack);
+                org.bukkit.block.Block blockClicked = craftWorld.getBlockAt(i, j, k);
+                BlockFace blockFace = CraftBlock.notchToBlockFace(1);
 
-            if (!world.z) {
-                world.a(((Entity) (new EntityMinecart(world, (float) i + 0.5F, (float) j + 0.5F, (float) k + 0.5F, a))));
+                PlayerItemEvent event = new PlayerItemEvent(eventType, who, itemInHand, blockClicked, blockFace);
+                craftServer.getPluginManager().callEvent(event);
+
+                if (event.isCancelled()) {
+                    return false;
+                }
+                // CraftBukkit end
+
+                world.a((Entity) (new EntityMinecart(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.a)));
             }
-            itemstack.a--;
+
+            --itemstack.count;
             return true;
         } else {
             return false;