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/ItemReed.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/ItemReed.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ItemReed.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/ItemReed.java b/src/main/java/net/minecraft/server/ItemReed.java index ab8164c7..156218d8 100644 --- a/src/main/java/net/minecraft/server/ItemReed.java +++ b/src/main/java/net/minecraft/server/ItemReed.java @@ -13,7 +13,7 @@ public class ItemReed extends Item { final int clickedX = i, clickedY = j, clickedZ = k; // CraftBukkit int i1 = world.getTypeId(i, j, k); - if (i1 == Block.SNOW.id) { + if (i1 == Block.SNOW.id && (world.getData(i, j, k) & 7) < 1) { l = 1; } else if (i1 != Block.VINE.id && i1 != Block.LONG_GRASS.id && i1 != Block.DEAD_BUSH.id) { if (l == 0) { @@ -46,16 +46,16 @@ public class ItemReed extends Item { } else if (itemstack.count == 0) { return false; } else { - if (world.mayPlace(this.id, i, j, k, false, l, (Entity) null)) { + if (world.mayPlace(this.id, i, j, k, false, l, (Entity) null, itemstack)) { Block block = Block.byId[this.id]; int j1 = block.getPlacedData(world, i, j, k, l, f, f1, f2, 0); // CraftBukkit start - redirect to common handler ItemBlock.processBlockPlace(world, entityhuman, itemstack, i, j, k, this.id, j1, clickedX, clickedY, clickedZ); /* - if (world.setTypeIdAndData(i, j, k, this.id, j1)) { + if (world.setTypeIdAndData(i, j, k, this.id, j1, 3)) { if (world.getTypeId(i, j, k) == this.id) { - Block.byId[this.id].postPlace(world, i, j, k, entityhuman); + Block.byId[this.id].postPlace(world, i, j, k, entityhuman, itemstack); Block.byId[this.id].postPlace(world, i, j, k, j1); } |