diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java')
-rw-r--r-- | src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java b/src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java index 0682194b..0358550a 100644 --- a/src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java +++ b/src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java @@ -12,7 +12,7 @@ final class DispenseBehaviorMinecart extends DispenseBehaviorItem { DispenseBehaviorMinecart() {} public ItemStack b(ISourceBlock isourceblock, ItemStack itemstack) { - EnumFacing enumfacing = BlockDispenser.l_(isourceblock.h()); + EnumFacing enumfacing = BlockDispenser.b(isourceblock.h()); World world = isourceblock.k(); double d0 = isourceblock.getX() + (double) ((float) enumfacing.c() * 1.125F); double d1 = isourceblock.getY() + (double) ((float) enumfacing.d() * 1.125F); @@ -20,13 +20,13 @@ final class DispenseBehaviorMinecart extends DispenseBehaviorItem { int i = isourceblock.getBlockX() + enumfacing.c(); int j = isourceblock.getBlockY() + enumfacing.d(); int k = isourceblock.getBlockZ() + enumfacing.e(); - int l = world.getTypeId(i, j, k); + Block block = world.getType(i, j, k); double d3; - if (BlockMinecartTrackAbstract.e_(l)) { + if (BlockMinecartTrackAbstract.a(block)) { d3 = 0.0D; } else { - if (l != 0 || !BlockMinecartTrackAbstract.e_(world.getTypeId(i, j - 1, k))) { + if (block.getMaterial() != Material.AIR || !BlockMinecartTrackAbstract.a(world.getType(i, j - 1, k))) { return this.b.a(isourceblock, itemstack); } @@ -35,10 +35,10 @@ final class DispenseBehaviorMinecart extends DispenseBehaviorItem { // CraftBukkit start ItemStack itemstack1 = itemstack.a(1); - org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockX(), isourceblock.getBlockY(), isourceblock.getBlockZ()); + org.bukkit.block.Block block2 = world.getWorld().getBlockAt(isourceblock.getBlockX(), isourceblock.getBlockY(), isourceblock.getBlockZ()); CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1); - BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(d0, d1 + d3, d2)); + BlockDispenseEvent event = new BlockDispenseEvent(block2, craftItem.clone(), new org.bukkit.util.Vector(d0, d1 + d3, d2)); if (!BlockDispenser.eventFired) { world.getServer().getPluginManager().callEvent(event); } |