From ad0e4b31bf8401d141682ae962f9c823571c5da1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 27 Nov 2016 17:03:28 +1100 Subject: SPIGOT-2850: NPE in CraftInventoryCrafting --- .../craftbukkit/inventory/CraftInventoryCrafting.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java index 2ae768fa..24d1804a 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java @@ -112,25 +112,16 @@ public class CraftInventoryCrafting extends CraftInventory implements CraftingIn for (int i = 0; i < mcItems.size(); i++) { if (i < contents.length) { - ItemStack item = contents[i]; - if (item == null || item.getTypeId() <= 0) { - getMatrixInventory().setItem(i, null); - } else { - getMatrixInventory().setItem(i, CraftItemStack.asNMSCopy(item)); - } + getMatrixInventory().setItem(i, CraftItemStack.asNMSCopy(contents[i])); } else { - getMatrixInventory().setItem(i, null); + getMatrixInventory().setItem(i, net.minecraft.server.ItemStack.a); } } } public void setResult(ItemStack item) { List contents = getResultInventory().getContents(); - if (item == null || item.getTypeId() <= 0) { - contents.set(0, net.minecraft.server.ItemStack.a); - } else { - contents.set(0, CraftItemStack.asNMSCopy(item)); - } + contents.set(0, CraftItemStack.asNMSCopy(item)); } public Recipe getRecipe() { -- cgit v1.2.3