diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-06-29 23:02:25 +0100 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-06-30 15:19:25 +0100 |
commit | a679e7f38025924dba3dd688ccb87e92306c4c3e (patch) | |
tree | 604a20c893873bef01a92eaa09d9309f32b7e29c /src/main/java/net/minecraft/server/BlockButton.java | |
parent | a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3 (diff) | |
download | craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar.gz craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar.lz craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar.xz craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.zip |
Update to Minecraft 1.7
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockButton.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockButton.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/main/java/net/minecraft/server/BlockButton.java b/src/main/java/net/minecraft/server/BlockButton.java index e961f793..a5b3c6a2 100644 --- a/src/main/java/net/minecraft/server/BlockButton.java +++ b/src/main/java/net/minecraft/server/BlockButton.java @@ -11,7 +11,7 @@ public class BlockButton extends Block { this.a(true); } - public AxisAlignedBB d(World world, int i, int j, int k) { + public AxisAlignedBB e(World world, int i, int j, int k) { return null; } @@ -28,11 +28,11 @@ public class BlockButton extends Block { } public boolean canPlace(World world, int i, int j, int k, int l) { - return l == 2 && world.d(i, j, k + 1) ? true : (l == 3 && world.d(i, j, k - 1) ? true : (l == 4 && world.d(i + 1, j, k) ? true : l == 5 && world.d(i - 1, j, k))); + return l == 2 && world.e(i, j, k + 1) ? true : (l == 3 && world.e(i, j, k - 1) ? true : (l == 4 && world.e(i + 1, j, k) ? true : l == 5 && world.e(i - 1, j, k))); } public boolean canPlace(World world, int i, int j, int k) { - return world.d(i - 1, j, k) ? true : (world.d(i + 1, j, k) ? true : (world.d(i, j, k - 1) ? true : world.d(i, j, k + 1))); + return world.e(i - 1, j, k) ? true : (world.e(i + 1, j, k) ? true : (world.e(i, j, k - 1) ? true : world.e(i, j, k + 1))); } public void postPlace(World world, int i, int j, int k, int l) { @@ -40,13 +40,13 @@ public class BlockButton extends Block { int j1 = i1 & 8; i1 &= 7; - if (l == 2 && world.d(i, j, k + 1)) { + if (l == 2 && world.e(i, j, k + 1)) { i1 = 4; - } else if (l == 3 && world.d(i, j, k - 1)) { + } else if (l == 3 && world.e(i, j, k - 1)) { i1 = 3; - } else if (l == 4 && world.d(i + 1, j, k)) { + } else if (l == 4 && world.e(i + 1, j, k)) { i1 = 2; - } else if (l == 5 && world.d(i - 1, j, k)) { + } else if (l == 5 && world.e(i - 1, j, k)) { i1 = 1; } else { i1 = this.g(world, i, j, k); @@ -56,7 +56,7 @@ public class BlockButton extends Block { } private int g(World world, int i, int j, int k) { - return world.d(i - 1, j, k) ? 1 : (world.d(i + 1, j, k) ? 2 : (world.d(i, j, k - 1) ? 3 : (world.d(i, j, k + 1) ? 4 : 1))); + return world.e(i - 1, j, k) ? 1 : (world.e(i + 1, j, k) ? 2 : (world.e(i, j, k - 1) ? 3 : (world.e(i, j, k + 1) ? 4 : 1))); } public void doPhysics(World world, int i, int j, int k, int l) { @@ -64,24 +64,24 @@ public class BlockButton extends Block { int i1 = world.getData(i, j, k) & 7; boolean flag = false; - if (!world.d(i - 1, j, k) && i1 == 1) { + if (!world.e(i - 1, j, k) && i1 == 1) { flag = true; } - if (!world.d(i + 1, j, k) && i1 == 2) { + if (!world.e(i + 1, j, k) && i1 == 2) { flag = true; } - if (!world.d(i, j, k - 1) && i1 == 3) { + if (!world.e(i, j, k - 1) && i1 == 3) { flag = true; } - if (!world.d(i, j, k + 1) && i1 == 4) { + if (!world.e(i, j, k + 1) && i1 == 4) { flag = true; } if (flag) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); } } @@ -89,7 +89,7 @@ public class BlockButton extends Block { private boolean h(World world, int i, int j, int k) { if (!this.canPlace(world, i, j, k)) { - this.b_(world, i, j, k, world.getData(i, j, k)); + this.g(world, i, j, k, world.getData(i, j, k)); world.setTypeId(i, j, k, 0); return false; } else { @@ -194,7 +194,7 @@ public class BlockButton extends Block { return (iblockaccess.getData(i, j, k) & 8) > 0; } - public boolean c(World world, int i, int j, int k, int l) { + public boolean d(World world, int i, int j, int k, int l) { int i1 = world.getData(i, j, k); if ((i1 & 8) == 0) { |