Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-09 20:30:28 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nathan Adams 2011-11-24 20:27:16 +00:00
parent a7664a104f
commit e31cedf583
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/InventoryPlayer.java
View File

@ -312,7 +312,7 @@ public class InventoryPlayer implements IInventory {
} }
public boolean b(Block block) { public boolean b(Block block) {
if (block.material.k()) { if (block != null && block.material.k()) { // CraftBukkit - fix NPE
return true; return true;
} else { } else {
ItemStack itemstack = this.getItem(this.itemInHandIndex); ItemStack itemstack = this.getItem(this.itemInHandIndex);

2
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@ -596,7 +596,7 @@ public final class CraftServer implements Server {
} }
WorldUnloadEvent e = new WorldUnloadEvent(handle.getWorld()); WorldUnloadEvent e = new WorldUnloadEvent(handle.getWorld());
pluginManager.callEvent(new WorldUnloadEvent(handle.getWorld())); pluginManager.callEvent(e);
if (e.isCancelled()) { if (e.isCancelled()) {
return false; return false;