Fix potentially server-crashing NPE

Whoops.
Jikoo · Nov 17, 2016 · 2e41b4b · 2e41b4b
1 parent e100dff
commit 2e41b4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/OpenInvPlugin/src/main/resources/plugin.yml → OpenInv/src/main/resources/plugin.yml b/OpenInvPlugin/src/main/resources/plugin.yml → OpenInv/src/main/resources/plugin.yml
diff --git a/...ukkit1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SilentContainerChest.java b/...ukkit1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SilentContainerChest.java
@@ -20,6 +20,7 @@
 import net.minecraft.server.v1_11_R1.ContainerChest;
 import net.minecraft.server.v1_11_R1.EntityHuman;
 import net.minecraft.server.v1_11_R1.IInventory;
+import net.minecraft.server.v1_11_R1.ItemStack;
 import net.minecraft.server.v1_11_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
@@ -37,9 +38,9 @@ public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
         PlayerInventory playerinventory = entityHuman.inventory;
 
-        if (playerinventory.getCarried() != null) {
+        if (!playerinventory.getCarried().isEmpty()) {
             entityHuman.drop(playerinventory.getCarried(), false);
-            playerinventory.setCarried(null);
+            playerinventory.setCarried(ItemStack.a);
         }
     }
 }