Fixed NPE in player inventory + don't ignore the cancel state of world unloads

2011-11-24 20:27:16 +00:00
parent a7664a104f
commit e31cedf583
2 changed files with 2 additions and 2 deletions
--- 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);