summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/BlockRedstoneWire.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2012-01-12 23:10:13 +0100
committerErik Broes <erikbroes@grum.nl>2012-01-12 23:10:13 +0100
commit7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee (patch)
treea1ca024b03aadf4b687f442b33bf713aecd511f7 /src/main/java/net/minecraft/server/BlockRedstoneWire.java
parentdd5ef8725c699e0b2946dc0f6d523ca482404043 (diff)
downloadcraftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.tar
craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.tar.gz
craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.tar.lz
craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.tar.xz
craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.zip
Updated to Minecraft 1.1
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockRedstoneWire.java')
-rw-r--r--src/main/java/net/minecraft/server/BlockRedstoneWire.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
index f1d7f2f2..07226d18 100644
--- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
+++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
@@ -171,7 +171,7 @@ public class BlockRedstoneWire extends Block {
}
}
- if (k1 == 0 || l1 == 0) {
+ if (k1 < l1 || l1 == 0) {
this.b.add(new ChunkPosition(i, j, k));
this.b.add(new ChunkPosition(i - 1, j, k));
this.b.add(new ChunkPosition(i + 1, j, k));
@@ -236,6 +236,10 @@ public class BlockRedstoneWire extends Block {
if (!world.isStatic) {
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);
this.g(world, i, j, k);
this.h(world, i - 1, j, k);
this.h(world, i + 1, j, k);
@@ -348,10 +352,8 @@ public class BlockRedstoneWire extends Block {
return true;
} else if (i1 == 0) {
return false;
- } else if (Block.byId[i1].isPowerSource() && l != -1) {
- return true;
} else if (i1 != Block.DIODE_OFF.id && i1 != Block.DIODE_ON.id) {
- return false;
+ return Block.byId[i1].isPowerSource() && l != -1;
} else {
int j1 = iblockaccess.getData(i, j, k);