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

SPIGOT-2850: NPE in CraftInventoryCrafting

Browse Source
This commit is contained in:
md_5 2016-11-27 17:03:28 +11:00
parent 27d625184d
commit ad0e4b31bf
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java
View File

@ -112,25 +112,16 @@ public class CraftInventoryCrafting extends CraftInventory implements CraftingIn
for (int i = 0; i < mcItems.size(); i++) { for (int i = 0; i < mcItems.size(); i++) {
if (i < contents.length) { if (i < contents.length) {
ItemStack item = contents[i]; getMatrixInventory().setItem(i, CraftItemStack.asNMSCopy(contents[i]));
if (item == null || item.getTypeId() <= 0) {
getMatrixInventory().setItem(i, null);
} else {
getMatrixInventory().setItem(i, CraftItemStack.asNMSCopy(item));
}
} else { } else {
getMatrixInventory().setItem(i, null); getMatrixInventory().setItem(i, net.minecraft.server.ItemStack.a);
} }
} }
} }
public void setResult(ItemStack item) { public void setResult(ItemStack item) {
List<net.minecraft.server.ItemStack> contents = getResultInventory().getContents(); List<net.minecraft.server.ItemStack> contents = getResultInventory().getContents();
if (item == null || item.getTypeId() <= 0) { contents.set(0, CraftItemStack.asNMSCopy(item));
contents.set(0, net.minecraft.server.ItemStack.a);
} else {
contents.set(0, CraftItemStack.asNMSCopy(item));
}
} }
public Recipe getRecipe() { public Recipe getRecipe() {