mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

SPIGOT-3342: Fix invalid usage of null in InventoryWrapper

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2017-06-15 20:25:06 +10:00
commit 0fab9a4f3a
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
paper-server/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);