summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTahg <tahgtahv@gmail.com>2011-03-07 13:53:38 -0500
committerTahg <tahgtahv@gmail.com>2011-03-10 13:07:00 -0500
commit803e67d55dca1a6c0b3c2bd602972154308d53a6 (patch)
tree55efc336811397cfb984ebb7d7c3ab25c9bed876
parent9428907e624aefaaaafa1e2d8704553f18d4c1e8 (diff)
downloadcraftbukkit-803e67d55dca1a6c0b3c2bd602972154308d53a6.tar
craftbukkit-803e67d55dca1a6c0b3c2bd602972154308d53a6.tar.gz
craftbukkit-803e67d55dca1a6c0b3c2bd602972154308d53a6.tar.lz
craftbukkit-803e67d55dca1a6c0b3c2bd602972154308d53a6.tar.xz
craftbukkit-803e67d55dca1a6c0b3c2bd602972154308d53a6.zip
Redstone fixes
-rw-r--r--src/main/java/net/minecraft/server/BlockRedstoneWire.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
index 4fe8a15c..e312fa84 100644
--- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
+++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
@@ -262,7 +262,7 @@ public class BlockRedstoneWire extends Block {
}
}
- private int g(World world, int i, int j, int k, int l) {
+ public int g(World world, int i, int j, int k, int l) { //Craftbukkit made public
if (world.getTypeId(i, j, k) != this.id) {
return l;
} else {
@@ -280,7 +280,7 @@ public class BlockRedstoneWire extends Block {
if (!flag) {
this.b_(world, i, j, k, i1);
world.e(i, j, k, 0);
- } else {
+ } else if(Block.byId[l].c() || Block.DIODE_OFF.id == l && Block.DIODE_ON.id == l) { //condition added by Craftbukkit
this.g(world, i, j, k);
}