diff options
| author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 01:23:52 +0100 |
|---|---|---|
| committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 01:23:52 +0100 |
| commit | 5b2c774edc069f70d1fa9940d96bb0b8705bef7a (patch) | |
| tree | 79d1800e7154bba7b5fca4f8c8373ee4376cca89 /src/main/java/net/minecraft/server/ItemBucket.java | |
| parent | 54bcd1c1f36691a714234e5ca2f30a20b3ad2816 (diff) | |
| download | craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.gz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.lz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.xz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.zip | |
Update for Minecraft 1.8
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemBucket.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/ItemBucket.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java index e1c2866a..6cb74b92 100644 --- a/src/main/java/net/minecraft/server/ItemBucket.java +++ b/src/main/java/net/minecraft/server/ItemBucket.java @@ -49,6 +49,10 @@ public class ItemBucket extends Item { } if (this.a == 0) { + if (!entityhuman.c(i, j, k)) { + return itemstack; + } + if (world.getMaterial(i, j, k) == Material.WATER && world.getData(i, j, k) == 0) { // CraftBukkit start PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent(entityhuman, i, j, k, -1, itemstack, Item.WATER_BUCKET); @@ -121,6 +125,10 @@ public class ItemBucket extends Item { ++i; } + if (!entityhuman.c(i, j, k)) { + return itemstack; + } + if (world.isEmpty(i, j, k) || !world.getMaterial(i, j, k).isBuildable()) { // CraftBukkit start PlayerBucketEmptyEvent event = CraftEventFactory.callPlayerBucketEmptyEvent(entityhuman, clickedX, clickedY, clickedZ, movingobjectposition.face, itemstack); @@ -140,6 +148,10 @@ public class ItemBucket extends Item { world.setTypeIdAndData(i, j, k, this.a, 0); } + if (entityhuman.K.d) { + return itemstack; + } + // CraftBukkit start CraftItemStack itemInHand = (CraftItemStack) event.getItemStack(); byte data = itemInHand.getData() == null ? (byte) 0 : itemInHand.getData().getData(); |