summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/BlockLeaves.java
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-09-15 01:23:52 +0100
committerDinnerbone <dinnerbone@dinnerbone.com>2011-09-15 01:23:52 +0100
commit5b2c774edc069f70d1fa9940d96bb0b8705bef7a (patch)
tree79d1800e7154bba7b5fca4f8c8373ee4376cca89 /src/main/java/net/minecraft/server/BlockLeaves.java
parent54bcd1c1f36691a714234e5ca2f30a20b3ad2816 (diff)
downloadcraftbukkit-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/BlockLeaves.java')
-rw-r--r--src/main/java/net/minecraft/server/BlockLeaves.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/BlockLeaves.java b/src/main/java/net/minecraft/server/BlockLeaves.java
index a0672562..2c035124 100644
--- a/src/main/java/net/minecraft/server/BlockLeaves.java
+++ b/src/main/java/net/minecraft/server/BlockLeaves.java
@@ -40,7 +40,7 @@ public class BlockLeaves extends BlockLeavesBase {
if (!world.isStatic) {
int l = world.getData(i, j, k);
- if ((l & 8) != 0) {
+ if ((l & 8) != 0 && (l & 4) == 0) {
byte b0 = 4;
int i1 = b0 + 1;
byte b1 = 32;
@@ -139,7 +139,7 @@ public class BlockLeaves extends BlockLeavesBase {
}
public void a(World world, EntityHuman entityhuman, int i, int j, int k, int l) {
- if (!world.isStatic && entityhuman.G() != null && entityhuman.G().id == Item.SHEARS.id) {
+ if (!world.isStatic && entityhuman.K() != null && entityhuman.K().id == Item.SHEARS.id) {
entityhuman.a(StatisticList.C[this.id], 1);
this.a(world, i, j, k, new ItemStack(Block.LEAVES.id, 1, l & 3));
} else {