summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2012-01-28 01:59:59 -0500
committerEvilSeph <evilseph@gmail.com>2012-01-28 03:09:48 -0500
commit7bdfea48204655ec8158784bc6653be3f281a5cf (patch)
tree8246ecd0d846b3e124e7825522d7e5690517fefb /src/main/java/net/minecraft/server/BlockRedstoneTorch.java
parent9d90839723deb5808df125c6b4b23d6a8156f23d (diff)
downloadcraftbukkit-7bdfea48204655ec8158784bc6653be3f281a5cf.tar
craftbukkit-7bdfea48204655ec8158784bc6653be3f281a5cf.tar.gz
craftbukkit-7bdfea48204655ec8158784bc6653be3f281a5cf.tar.lz
craftbukkit-7bdfea48204655ec8158784bc6653be3f281a5cf.tar.xz
craftbukkit-7bdfea48204655ec8158784bc6653be3f281a5cf.zip
Reverted onPlace changes.
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockRedstoneTorch.java')
-rw-r--r--src/main/java/net/minecraft/server/BlockRedstoneTorch.java22
1 files changed, 8 insertions, 14 deletions
diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
index f369c0fb..e9986db9 100644
--- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
+++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
@@ -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
}
}