Reverted onPlace changes.

This commit is contained in:
EvilSeph
2012-01-28 01:59:59 -05:00
parent 9d90839723
commit 7bdfea4820
12 changed files with 16 additions and 656 deletions

View File

@@ -50,19 +50,15 @@ public class BlockRedstoneTorch extends BlockTorch {
if (world.getData(i, j, k) == 0) {
super.onPlace(world, i, j, k);
}
// CraftBukkit start - onPlace(World, int, int, int) -> postPlace(World, int, int, int, int)
}
public void postPlace(World world, int i, int j, int k, int l) {
super.postPlace(world, i, j, k, l);
world.applyPhysics(i, j - 1, k, this.id);
world.applyPhysics(i, j + 1, k, this.id);
world.applyPhysics(i - 1, j, k, this.id);
world.applyPhysics(i + 1, j, k, this.id);
world.applyPhysics(i, j, k - 1, this.id);
world.applyPhysics(i, j, k + 1, this.id);
// CraftBukkit end
if (this.isOn) {
world.applyPhysics(i, j - 1, k, this.id);
world.applyPhysics(i, j + 1, k, this.id);
world.applyPhysics(i - 1, j, k, this.id);
world.applyPhysics(i + 1, j, k, this.id);
world.applyPhysics(i, j, k - 1, this.id);
world.applyPhysics(i, j, k + 1, this.id);
}
}
public void remove(World world, int i, int j, int k) {
@@ -120,7 +116,6 @@ public class BlockRedstoneTorch extends BlockTorch {
// CraftBukkit end
world.setTypeIdAndData(i, j, k, Block.REDSTONE_TORCH_OFF.id, world.getData(i, j, k));
this.postPlace(world, i, j, k, this.id); // CraftBukkit - update indirect neighbors
if (this.a(world, i, j, k, true)) {
world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), "random.fizz", 0.5F, 2.6F + (world.random.nextFloat() - world.random.nextFloat()) * 0.8F);
@@ -145,7 +140,6 @@ public class BlockRedstoneTorch extends BlockTorch {
// CraftBukkit end
world.setTypeIdAndData(i, j, k, Block.REDSTONE_TORCH_ON.id, world.getData(i, j, k));
this.postPlace(world, i, j, k, this.id); // CraftBukkit - update indirect neighbors
}
}