From 09ddd9b35e490d611ee74c999117dc2cdacd487f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 18 Jul 2015 12:43:33 +1000 Subject: [PATCH] SPIGOT-1051: CraftInventoryPlayer.setItem can cause NPE. --- .../org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java index 98213c7bb..dba8d5ba1 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()