From 5d0878be0485847ea4a5a122e3899e9b64e2b981 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Fri, 20 Jan 2012 11:45:37 -0500 Subject: [PATCH] Accounted for NMS getItem() returning null in recent commit. By: EvilSeph --- .../java/org/bukkit/craftbukkit/inventory/CraftInventory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java index b5391b35c9..d4e62a2b85 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java @@ -27,7 +27,7 @@ public class CraftInventory implements org.bukkit.inventory.Inventory { } public ItemStack getItem(int index) { - return getInventory().getItem(index).id == 0 ? null : new CraftItemStack(getInventory().getItem(index)); + return (getInventory().getItem(index) == null || getInventory().getItem(index).id == 0) ? null : new CraftItemStack(getInventory().getItem(index)); } public ItemStack[] getContents() {