diff options
| author | Tahg <tahgtahv@gmail.com> | 2011-03-11 20:47:59 -0500 |
|---|---|---|
| committer | Tahg <tahgtahv@gmail.com> | 2011-03-11 20:47:59 -0500 |
| commit | 79ccc5320a29079152798a47c4c43b7e9ac5a217 (patch) | |
| tree | fd6374333c706c2a901207097d079f84308bc64d /src | |
| parent | 5c4f1d75b5dc510052eac608421bd7d79dd289ee (diff) | |
| download | craftbukkit-79ccc5320a29079152798a47c4c43b7e9ac5a217.tar craftbukkit-79ccc5320a29079152798a47c4c43b7e9ac5a217.tar.gz craftbukkit-79ccc5320a29079152798a47c4c43b7e9ac5a217.tar.lz craftbukkit-79ccc5320a29079152798a47c4c43b7e9ac5a217.tar.xz craftbukkit-79ccc5320a29079152798a47c4c43b7e9ac5a217.zip | |
more NPE fixes regarding redstone
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockBloodStone.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockPumpkin.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockSign.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/BlockBloodStone.java b/src/main/java/net/minecraft/server/BlockBloodStone.java index 9a3c9efc..08aa0d62 100644 --- a/src/main/java/net/minecraft/server/BlockBloodStone.java +++ b/src/main/java/net/minecraft/server/BlockBloodStone.java @@ -12,7 +12,7 @@ public class BlockBloodStone extends Block { // Craftbukkit start public void a(World world, int i, int j, int k, int l) { - if (net.minecraft.server.Block.byId[l].c()) { + if (net.minecraft.server.Block.byId[l] != null && net.minecraft.server.Block.byId[l].c()) { CraftWorld craftWorld = ((WorldServer) world).getWorld(); CraftServer server = ((WorldServer) world).getServer(); org.bukkit.block.Block block = craftWorld.getBlockAt(i, j, k); diff --git a/src/main/java/net/minecraft/server/BlockPumpkin.java b/src/main/java/net/minecraft/server/BlockPumpkin.java index 594e4850..94f00cc7 100644 --- a/src/main/java/net/minecraft/server/BlockPumpkin.java +++ b/src/main/java/net/minecraft/server/BlockPumpkin.java @@ -53,7 +53,7 @@ public class BlockPumpkin extends Block { // Craftbukkit start public void a(World world, int i, int j, int k, int l) { - if (net.minecraft.server.Block.byId[l].c()) { + if (net.minecraft.server.Block.byId[l] != null && net.minecraft.server.Block.byId[l].c()) { CraftWorld craftWorld = ((WorldServer) world).getWorld(); CraftServer server = ((WorldServer) world).getServer(); org.bukkit.block.Block block = craftWorld.getBlockAt(i, j, k); diff --git a/src/main/java/net/minecraft/server/BlockSign.java b/src/main/java/net/minecraft/server/BlockSign.java index 49b3f176..eab330de 100644 --- a/src/main/java/net/minecraft/server/BlockSign.java +++ b/src/main/java/net/minecraft/server/BlockSign.java @@ -106,7 +106,7 @@ public class BlockSign extends BlockContainer { super.a(world, i, j, k, l); // Craftbukkit start - if (net.minecraft.server.Block.byId[l].c()) { + if (net.minecraft.server.Block.byId[l] != null && net.minecraft.server.Block.byId[l].c()) { CraftWorld craftWorld = ((WorldServer) world).getWorld(); CraftServer server = ((WorldServer) world).getServer(); Block block = craftWorld.getBlockAt(i, j, k); |