diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2012-10-24 22:53:23 -0500 |
---|---|---|
committer | EvilSeph <evilseph@gmail.com> | 2012-10-27 22:19:03 -0400 |
commit | 60819c6693daf19dde68b04af38a4fee8c7da988 (patch) | |
tree | e7bd96a07f0e9d9f1f6b2721ddd1bb5dd71eaf48 /src/main/java/net/minecraft/server/BlockLeaves.java | |
parent | b9a72531b6e2ccc84bd021bca421255a957d96f7 (diff) | |
download | craftbukkit-60819c6693daf19dde68b04af38a4fee8c7da988.tar craftbukkit-60819c6693daf19dde68b04af38a4fee8c7da988.tar.gz craftbukkit-60819c6693daf19dde68b04af38a4fee8c7da988.tar.lz craftbukkit-60819c6693daf19dde68b04af38a4fee8c7da988.tar.xz craftbukkit-60819c6693daf19dde68b04af38a4fee8c7da988.zip |
Update CraftBukkit to Minecraft 1.4(.2).
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockLeaves.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockLeaves.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/net/minecraft/server/BlockLeaves.java b/src/main/java/net/minecraft/server/BlockLeaves.java index 7f7066b5..a2bd362f 100644 --- a/src/main/java/net/minecraft/server/BlockLeaves.java +++ b/src/main/java/net/minecraft/server/BlockLeaves.java @@ -6,13 +6,13 @@ import org.bukkit.event.block.LeavesDecayEvent; // CraftBukkit public class BlockLeaves extends BlockTransparant { - private int cr; + private int cD; public static final String[] a = new String[] { "oak", "spruce", "birch", "jungle"}; int[] b; protected BlockLeaves(int i, int j) { super(i, j, Material.LEAVES, false); - this.cr = j; + this.cD = j; this.b(true); this.a(CreativeModeTab.c); } @@ -21,7 +21,7 @@ public class BlockLeaves extends BlockTransparant { byte b0 = 1; int j1 = b0 + 1; - if (world.c(i - j1, j - j1, k - j1, i + j1, j + j1, k + j1)) { + if (world.d(i - j1, j - j1, k - j1, i + j1, j + j1, k + j1)) { for (int k1 = -b0; k1 <= b0; ++k1) { for (int l1 = -b0; l1 <= b0; ++l1) { for (int i2 = -b0; i2 <= b0; ++i2) { @@ -55,7 +55,7 @@ public class BlockLeaves extends BlockTransparant { int l1; - if (world.c(i - i1, j - i1, k - i1, i + i1, j + i1, k + i1)) { + if (world.d(i - i1, j - i1, k - i1, i + i1, j + i1, k + i1)) { int i2; int j2; int k2; @@ -163,7 +163,7 @@ public class BlockLeaves extends BlockTransparant { } public void a(World world, EntityHuman entityhuman, int i, int j, int k, int l) { - if (!world.isStatic && entityhuman.bC() != null && entityhuman.bC().id == Item.SHEARS.id) { + if (!world.isStatic && entityhuman.bP() != null && entityhuman.bP().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 { @@ -171,11 +171,11 @@ public class BlockLeaves extends BlockTransparant { } } - protected int getDropData(int i) { + public int getDropData(int i) { return i & 3; } - public boolean d() { + public boolean c() { return !this.c; } |