From 2726696652179a5ead7dc07dd39edf7dfda687f7 Mon Sep 17 00:00:00 2001 From: mbax Date: Mon, 4 Nov 2013 07:07:38 -0600 Subject: Update CraftBukkit to Minecraft 1.7.2 --- src/main/java/net/minecraft/server/ItemMinecart.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/main/java/net/minecraft/server/ItemMinecart.java') diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java index 5df0c320..02a1fd8e 100644 --- a/src/main/java/net/minecraft/server/ItemMinecart.java +++ b/src/main/java/net/minecraft/server/ItemMinecart.java @@ -5,18 +5,15 @@ public class ItemMinecart extends Item { private static final IDispenseBehavior b = new DispenseBehaviorMinecart(); public int a; - public ItemMinecart(int i, int j) { - super(i); + public ItemMinecart(int i) { this.maxStackSize = 1; - this.a = j; + this.a = i; this.a(CreativeModeTab.e); BlockDispenser.a.a(this, b); } public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l, float f, float f1, float f2) { - int i1 = world.getTypeId(i, j, k); - - if (BlockMinecartTrackAbstract.e_(i1)) { + if (BlockMinecartTrackAbstract.a(world.getType(i, j, k))) { if (!world.isStatic) { // CraftBukkit start - Minecarts org.bukkit.event.player.PlayerInteractEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(entityhuman, org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK, i, j, k, l, itemstack); @@ -25,7 +22,6 @@ public class ItemMinecart extends Item { return false; } // CraftBukkit end - EntityMinecartAbstract entityminecartabstract = EntityMinecartAbstract.a(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.a); if (itemstack.hasName()) { -- cgit v1.2.3