diff options
| -rw-r--r-- | src/main/java/net/minecraft/server/InventoryPlayer.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftServer.java | 2 |
2 files changed, 2 insertions, 2 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); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index cfa80090..5a730fd9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -596,7 +596,7 @@ public final class CraftServer implements Server { } WorldUnloadEvent e = new WorldUnloadEvent(handle.getWorld()); - pluginManager.callEvent(new WorldUnloadEvent(handle.getWorld())); + pluginManager.callEvent(e); if (e.isCancelled()) { return false; |