diff options
| author | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-01 10:49:23 +0000 |
|---|---|---|
| committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-01 14:38:31 +0000 |
| commit | 543c4879fee3b7165764c5371d226c93fe3a657b (patch) | |
| tree | 4fe9116464e1fe42a40dc3ba19b58234bd26f821 /src/main/java/net/minecraft/server/BlockPiston.java | |
| parent | e9ca87000c1794715bc3fe0a7d1caaf809057635 (diff) | |
| download | craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.gz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.lz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.xz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.zip | |
Updated CraftBukkit to 1.2
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockPiston.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockPiston.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java index 0e35a7bb..39a880de 100644 --- a/src/main/java/net/minecraft/server/BlockPiston.java +++ b/src/main/java/net/minecraft/server/BlockPiston.java @@ -139,7 +139,7 @@ public class BlockPiston extends Block { if (tileentitypiston.f() == i1 && tileentitypiston.e()) { tileentitypiston.g(); i2 = tileentitypiston.c(); - j2 = tileentitypiston.j(); + j2 = tileentitypiston.k(); flag = true; } } @@ -213,6 +213,11 @@ public class BlockPiston extends Block { super.a(world, i, j, k, axisalignedbb, arraylist); } + public AxisAlignedBB e(World world, int i, int j, int k) { + this.updateShape(world, i, j, k); + return super.e(world, i, j, k); + } + public boolean b() { return false; } @@ -277,7 +282,7 @@ public class BlockPiston extends Block { while (true) { if (l1 < 13) { - if (j1 <= 0 || j1 >= world.height - 1) { + if (j1 <= 0 || j1 >= 255) { return -1; // CraftBukkit } @@ -316,7 +321,7 @@ public class BlockPiston extends Block { int i2; if (l1 < 13) { - if (j1 <= 0 || j1 >= world.height - 1) { + if (j1 <= 0 || j1 >= 255) { return false; } |