summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/BlockRedstoneWire.java
diff options
context:
space:
mode:
authorTahg <tahgtahv@gmail.com>2011-03-11 00:36:19 -0500
committerTahg <tahgtahv@gmail.com>2011-03-11 00:36:19 -0500
commit786fdfb9fed75ebabfb4648a824ff39de91fbc35 (patch)
tree02c54523969be7c0172b3770053a303b3846b73b /src/main/java/net/minecraft/server/BlockRedstoneWire.java
parentc06f3e0d7627e7fcfd4178bdb3200a1787577783 (diff)
downloadcraftbukkit-786fdfb9fed75ebabfb4648a824ff39de91fbc35.tar
craftbukkit-786fdfb9fed75ebabfb4648a824ff39de91fbc35.tar.gz
craftbukkit-786fdfb9fed75ebabfb4648a824ff39de91fbc35.tar.lz
craftbukkit-786fdfb9fed75ebabfb4648a824ff39de91fbc35.tar.xz
craftbukkit-786fdfb9fed75ebabfb4648a824ff39de91fbc35.zip
NPE fix in redstone
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockRedstoneWire.java')
-rw-r--r--src/main/java/net/minecraft/server/BlockRedstoneWire.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
index e312fa84..88dda17b 100644
--- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
+++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
@@ -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 if(Block.byId[l].c() || Block.DIODE_OFF.id == l && Block.DIODE_ON.id == l) { //condition added by Craftbukkit
+ } else if((Block.byId[l] != null && Block.byId[l].c()) || Block.DIODE_OFF.id == l && Block.DIODE_ON.id == l) { //condition added by Craftbukkit
this.g(world, i, j, k);
}