diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockPistonExtension.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockPistonExtension.java | 77 |
1 files changed, 38 insertions, 39 deletions
diff --git a/src/main/java/net/minecraft/server/BlockPistonExtension.java b/src/main/java/net/minecraft/server/BlockPistonExtension.java index e6a7b186..28967175 100644 --- a/src/main/java/net/minecraft/server/BlockPistonExtension.java +++ b/src/main/java/net/minecraft/server/BlockPistonExtension.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import java.util.ArrayList; +import java.util.List; import java.util.Random; public class BlockPistonExtension extends Block { @@ -13,41 +13,40 @@ public class BlockPistonExtension extends Block { this.c(0.5F); } - public void remove(World world, int i, int j, int k) { - super.remove(world, i, j, k); - int l = world.getData(i, j, k); - if (l > 5 || l < 0) return; // CraftBukkit - fixed a piston AIOOBE issue. - int i1 = Facing.OPPOSITE_FACING[b(l)]; - - i += Facing.b[i1]; - j += Facing.c[i1]; - k += Facing.d[i1]; - int j1 = world.getTypeId(i, j, k); - - if (j1 == Block.PISTON.id || j1 == Block.PISTON_STICKY.id) { - l = world.getData(i, j, k); - if (BlockPiston.e(l)) { - Block.byId[j1].b(world, i, j, k, l, 0); + public void remove(World world, int i, int j, int k, int l, int i1) { + super.remove(world, i, j, k, l, i1); + if (i1 > 5 || i1 < 0) return; // CraftBukkit - fixed a piston AIOOBE issue + int j1 = Facing.OPPOSITE_FACING[f(i1)]; + + i += Facing.b[j1]; + j += Facing.c[j1]; + k += Facing.d[j1]; + int k1 = world.getTypeId(i, j, k); + + if (k1 == Block.PISTON.id || k1 == Block.PISTON_STICKY.id) { + i1 = world.getData(i, j, k); + if (BlockPiston.f(i1)) { + Block.byId[k1].c(world, i, j, k, i1, 0); world.setTypeId(i, j, k, 0); } } } public int a(int i, int j) { - int k = b(j); + int k = f(j); - return i == k ? (this.a >= 0 ? this.a : ((j & 8) != 0 ? this.textureId - 1 : this.textureId)) : (i == Facing.OPPOSITE_FACING[k] ? 107 : 108); + return i == k ? (this.a >= 0 ? this.a : ((j & 8) != 0 ? this.textureId - 1 : this.textureId)) : (k < 6 && i == Facing.OPPOSITE_FACING[k] ? 107 : 108); } - public int c() { + public int b() { return 17; } - public boolean a() { + public boolean d() { return false; } - public boolean b() { + public boolean c() { return false; } @@ -63,50 +62,50 @@ public class BlockPistonExtension extends Block { return 0; } - public void a(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, ArrayList arraylist) { + public void a(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, List list, Entity entity) { int l = world.getData(i, j, k); - switch (b(l)) { + switch (f(l)) { case 0: this.a(0.0F, 0.0F, 0.0F, 1.0F, 0.25F, 1.0F); - super.a(world, i, j, k, axisalignedbb, arraylist); + super.a(world, i, j, k, axisalignedbb, list, entity); this.a(0.375F, 0.25F, 0.375F, 0.625F, 1.0F, 0.625F); - super.a(world, i, j, k, axisalignedbb, arraylist); + super.a(world, i, j, k, axisalignedbb, list, entity); break; case 1: this.a(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); - super.a(world, i, j, k, axisalignedbb, arraylist); + super.a(world, i, j, k, axisalignedbb, list, entity); this.a(0.375F, 0.0F, 0.375F, 0.625F, 0.75F, 0.625F); - super.a(world, i, j, k, axisalignedbb, arraylist); + super.a(world, i, j, k, axisalignedbb, list, entity); break; case 2: this.a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 0.25F); - super.a(world, i, j, k, axisalignedbb, arraylist); + super.a(world, i, j, k, axisalignedbb, list, entity); this.a(0.25F, 0.375F, 0.25F, 0.75F, 0.625F, 1.0F); - super.a(world, i, j, k, axisalignedbb, arraylist); + super.a(world, i, j, k, axisalignedbb, list, entity); break; case 3: this.a(0.0F, 0.0F, 0.75F, 1.0F, 1.0F, 1.0F); - super.a(world, i, j, k, axisalignedbb, arraylist); + super.a(world, i, j, k, axisalignedbb, list, entity); this.a(0.25F, 0.375F, 0.0F, 0.75F, 0.625F, 0.75F); - super.a(world, i, j, k, axisalignedbb, arraylist); + super.a(world, i, j, k, axisalignedbb, list, entity); break; case 4: this.a(0.0F, 0.0F, 0.0F, 0.25F, 1.0F, 1.0F); - super.a(world, i, j, k, axisalignedbb, arraylist); + super.a(world, i, j, k, axisalignedbb, list, entity); this.a(0.375F, 0.25F, 0.25F, 0.625F, 0.75F, 1.0F); - super.a(world, i, j, k, axisalignedbb, arraylist); + super.a(world, i, j, k, axisalignedbb, list, entity); break; case 5: this.a(0.75F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - super.a(world, i, j, k, axisalignedbb, arraylist); + super.a(world, i, j, k, axisalignedbb, list, entity); this.a(0.0F, 0.375F, 0.25F, 0.75F, 0.625F, 0.75F); - super.a(world, i, j, k, axisalignedbb, arraylist); + super.a(world, i, j, k, axisalignedbb, list, entity); } this.a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); @@ -115,7 +114,7 @@ public class BlockPistonExtension extends Block { public void updateShape(IBlockAccess iblockaccess, int i, int j, int k) { int l = iblockaccess.getData(i, j, k); - switch (b(l)) { + switch (f(l)) { case 0: this.a(0.0F, 0.0F, 0.0F, 1.0F, 0.25F, 1.0F); break; @@ -142,8 +141,8 @@ public class BlockPistonExtension extends Block { } public void doPhysics(World world, int i, int j, int k, int l) { - int i1 = b(world.getData(i, j, k)); - if (i1 > 5 || i1 < 0) return; // CraftBukkit - fixed a piston AIOOBE issue. + int i1 = f(world.getData(i, j, k)); + if (i1 > 5 || i1 < 0) return; // CraftBukkit - fixed a piston AIOOBE issue int j1 = world.getTypeId(i - Facing.b[i1], j - Facing.c[i1], k - Facing.d[i1]); if (j1 != Block.PISTON.id && j1 != Block.PISTON_STICKY.id) { @@ -153,7 +152,7 @@ public class BlockPistonExtension extends Block { } } - public static int b(int i) { + public static int f(int i) { return i & 7; } } |