Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-17 17:31:06 +02:00
Code Issues Projects Releases Wiki Activity

SPIGOT-3342: Fix invalid usage of null in InventoryWrapper

Browse Source
This commit is contained in:
md_5 2017-06-15 20:25:06 +10:00
parent 732911efbc
commit 885da43758
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/bukkit/craftbukkit/inventory/InventoryWrapper.java
View File

@ -39,11 +39,11 @@ public class InventoryWrapper implements IInventory {
// Copied from CraftItemStack // Copied from CraftItemStack
ItemStack stack = getItem(i); ItemStack stack = getItem(i);
ItemStack result; ItemStack result;
if (stack == null) { if (stack.isEmpty()) {
return null; return stack;
} }
if (stack.getCount() <= j) { if (stack.getCount() <= j) {
this.setItem(i, null); this.setItem(i, ItemStack.a);
result = stack; result = stack;
} else { } else {
result = CraftItemStack.copyNMSStack(stack, j); result = CraftItemStack.copyNMSStack(stack, j);
@ -58,11 +58,11 @@ public class InventoryWrapper implements IInventory {
// Copied from CraftItemStack // Copied from CraftItemStack
ItemStack stack = getItem(i); ItemStack stack = getItem(i);
ItemStack result; ItemStack result;
if (stack == null) { if (stack.isEmpty()) {
return null; return stack;
} }
if (stack.getCount() <= 1) { if (stack.getCount() <= 1) {
this.setItem(i, null); this.setItem(i, ItemStack.a);
result = stack; result = stack;
} else { } else {
result = CraftItemStack.copyNMSStack(stack, 1); result = CraftItemStack.copyNMSStack(stack, 1);