diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2013-03-13 17:33:27 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2013-03-15 13:28:59 -0500 |
commit | 83d29e461c85733f0113b6eb19db6e3b42da2949 (patch) | |
tree | b3063a1c28f478ab368d5ba3413a842def68c28f /src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java | |
parent | ba6e4c38cfa98ad291974195cc46d70a4f138ac1 (diff) | |
download | craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.gz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.lz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.xz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.zip |
Update CraftBukkit to Minecraft 1.5
Diffstat (limited to 'src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java')
-rw-r--r-- | src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java b/src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java index b381e223..8f7e09b2 100644 --- a/src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java +++ b/src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java @@ -5,22 +5,17 @@ import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.event.block.BlockDispenseEvent; // CraftBukkit end -public class DispenseBehaviorEmptyBucket extends DispenseBehaviorItem { +final class DispenseBehaviorEmptyBucket extends DispenseBehaviorItem { - private final DispenseBehaviorItem c; + private final DispenseBehaviorItem b = new DispenseBehaviorItem(); - final MinecraftServer b; - - public DispenseBehaviorEmptyBucket(MinecraftServer minecraftserver) { - this.b = minecraftserver; - this.c = new DispenseBehaviorItem(); - } + DispenseBehaviorEmptyBucket() {} public ItemStack b(ISourceBlock isourceblock, ItemStack itemstack) { - EnumFacing enumfacing = EnumFacing.a(isourceblock.h()); + EnumFacing enumfacing = BlockDispenser.j_(isourceblock.h()); World world = isourceblock.k(); int i = isourceblock.getBlockX() + enumfacing.c(); - int j = isourceblock.getBlockY(); + int j = isourceblock.getBlockY() + enumfacing.d(); int k = isourceblock.getBlockZ() + enumfacing.e(); Material material = world.getMaterial(i, j, k); int l = world.getData(i, j, k); @@ -60,12 +55,12 @@ public class DispenseBehaviorEmptyBucket extends DispenseBehaviorItem { } // CraftBukkit end - world.setTypeId(i, j, k, 0); + world.setAir(i, j, k); if (--itemstack.count == 0) { itemstack.id = item.id; itemstack.count = 1; } else if (((TileEntityDispenser) isourceblock.getTileEntity()).addItem(new ItemStack(item)) < 0) { - this.c.a(isourceblock, new ItemStack(item)); + this.b.a(isourceblock, new ItemStack(item)); } return itemstack; |