From 0fab9a4f3a4ac41d097155b7cc935ca3a6184b9c Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Thu, 15 Jun 2017 20:25:06 +1000
Subject: [PATCH] SPIGOT-3342: Fix invalid usage of null in InventoryWrapper

By: md_5 <git@md-5.net>
---
 .../craftbukkit/inventory/InventoryWrapper.java      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/InventoryWrapper.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/InventoryWrapper.java
index d2a00849ce2..6cbcc9d30b4 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/InventoryWrapper.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/InventoryWrapper.java
@@ -39,11 +39,11 @@ public class InventoryWrapper implements IInventory {
         // Copied from CraftItemStack
         ItemStack stack = getItem(i);
         ItemStack result;
-        if (stack == null) {
-            return null;
+        if (stack.isEmpty()) {
+            return stack;
         }
         if (stack.getCount() <= j) {
-            this.setItem(i, null);
+            this.setItem(i, ItemStack.a);
             result = stack;
         } else {
             result = CraftItemStack.copyNMSStack(stack, j);
@@ -58,11 +58,11 @@ public class InventoryWrapper implements IInventory {
         // Copied from CraftItemStack
         ItemStack stack = getItem(i);
         ItemStack result;
-        if (stack == null) {
-            return null;
+        if (stack.isEmpty()) {
+            return stack;
         }
         if (stack.getCount() <= 1) {
-            this.setItem(i, null);
+            this.setItem(i, ItemStack.a);
             result = stack;
         } else {
             result = CraftItemStack.copyNMSStack(stack, 1);