diff options
| author | md_5 <git@md-5.net> | 2015-07-18 12:43:33 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2015-07-18 12:43:33 +1000 |
| commit | 09ddd9b35e490d611ee74c999117dc2cdacd487f (patch) | |
| tree | 516af0842af4fae82a437b574c0e1c56be16b10a /src/main/java/org/bukkit | |
| parent | af00fd2a20fe709ce5b2c60f6dfc90efdc66e92d (diff) | |
| download | craftbukkit-09ddd9b35e490d611ee74c999117dc2cdacd487f.tar craftbukkit-09ddd9b35e490d611ee74c999117dc2cdacd487f.tar.gz craftbukkit-09ddd9b35e490d611ee74c999117dc2cdacd487f.tar.lz craftbukkit-09ddd9b35e490d611ee74c999117dc2cdacd487f.tar.xz craftbukkit-09ddd9b35e490d611ee74c999117dc2cdacd487f.zip | |
SPIGOT-1051: CraftInventoryPlayer.setItem can cause NPE.
Diffstat (limited to 'src/main/java/org/bukkit')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java index 98213c7b..dba8d5ba 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java @@ -37,6 +37,7 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i @Override public void setItem(int index, ItemStack item) { super.setItem(index, item); + if (this.getHolder() == null) return; EntityPlayer player = ((CraftPlayer) this.getHolder()).getHandle(); if (player.playerConnection == null) return; // PacketPlayOutSetSlot places the items differently than setItem() |