From 79ccc5320a29079152798a47c4c43b7e9ac5a217 Mon Sep 17 00:00:00 2001
From: Tahg <tahgtahv@gmail.com>
Date: Fri, 11 Mar 2011 20:47:59 -0500
Subject: more NPE fixes regarding redstone

---
 src/main/java/net/minecraft/server/BlockBloodStone.java | 2 +-
 src/main/java/net/minecraft/server/BlockPumpkin.java    | 2 +-
 src/main/java/net/minecraft/server/BlockSign.java       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

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);
-- 
cgit v1.2.3