diff options
author | mbax <matt@phozop.net> | 2013-11-04 07:07:38 -0600 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2013-11-30 19:26:12 -0600 |
commit | 2726696652179a5ead7dc07dd39edf7dfda687f7 (patch) | |
tree | ff78e22fdd4fc01889a5f6cc482b599f965cd93a /src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java | |
parent | ff8b70fbb7a96b9d2ff078afcf3b3ff90f200981 (diff) | |
download | craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.gz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.lz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.xz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.zip |
Update CraftBukkit to Minecraft 1.7.2
Diffstat (limited to 'src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java')
-rw-r--r-- | src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java b/src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java index 1e6d8529..04693a55 100644 --- a/src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java +++ b/src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java @@ -12,23 +12,23 @@ final class DispenseBehaviorEmptyBucket extends DispenseBehaviorItem { DispenseBehaviorEmptyBucket() {} public ItemStack b(ISourceBlock isourceblock, ItemStack itemstack) { - EnumFacing enumfacing = BlockDispenser.l_(isourceblock.h()); + EnumFacing enumfacing = BlockDispenser.b(isourceblock.h()); World world = isourceblock.k(); int i = isourceblock.getBlockX() + enumfacing.c(); int j = isourceblock.getBlockY() + enumfacing.d(); int k = isourceblock.getBlockZ() + enumfacing.e(); - Material material = world.getMaterial(i, j, k); + Material material = world.getType(i, j, k).getMaterial(); int l = world.getData(i, j, k); Item item; if (Material.WATER.equals(material) && l == 0) { - item = Item.WATER_BUCKET; + item = Items.WATER_BUCKET; } else { if (!Material.LAVA.equals(material) || l != 0) { return super.b(isourceblock, itemstack); } - item = Item.LAVA_BUCKET; + item = Items.LAVA_BUCKET; } // CraftBukkit start @@ -57,7 +57,7 @@ final class DispenseBehaviorEmptyBucket extends DispenseBehaviorItem { world.setAir(i, j, k); if (--itemstack.count == 0) { - itemstack.id = item.id; + itemstack.setItem(item); itemstack.count = 1; } else if (((TileEntityDispenser) isourceblock.getTileEntity()).addItem(new ItemStack(item)) < 0) { this.b.a(isourceblock, new ItemStack(item)); |