summaryrefslogtreecommitdiffstats
path: root/src/main/java/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net')
-rw-r--r--src/main/java/net/minecraft/server/InventoryPlayer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/InventoryPlayer.java b/src/main/java/net/minecraft/server/InventoryPlayer.java
index ef395e3a..0626a810 100644
--- a/src/main/java/net/minecraft/server/InventoryPlayer.java
+++ b/src/main/java/net/minecraft/server/InventoryPlayer.java
@@ -312,7 +312,7 @@ public class InventoryPlayer implements IInventory {
}
public boolean b(Block block) {
- if (block.material.k()) {
+ if (block != null && block.material.k()) { // CraftBukkit - fix NPE
return true;
} else {
ItemStack itemstack = this.getItem(this.itemInHandIndex);