From 2e41b4bd45f646336292118c7e513778d92c3d33 Mon Sep 17 00:00:00 2001 From: Jikoo Date: Thu, 17 Nov 2016 03:22:24 -0500 Subject: [PATCH] Fix potentially server-crashing NPE Whoops. --- {OpenInvPlugin => OpenInv}/src/main/resources/plugin.yml | 0 .../openinv/internal/v1_11_R1/SilentContainerChest.java | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) rename {OpenInvPlugin => OpenInv}/src/main/resources/plugin.yml (100%) diff --git a/OpenInvPlugin/src/main/resources/plugin.yml b/OpenInv/src/main/resources/plugin.yml similarity index 100% rename from OpenInvPlugin/src/main/resources/plugin.yml rename to OpenInv/src/main/resources/plugin.yml diff --git a/OpenInvCraftbukkit1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SilentContainerChest.java b/OpenInvCraftbukkit1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SilentContainerChest.java index 4512f7a..b798576 100644 --- a/OpenInvCraftbukkit1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SilentContainerChest.java +++ b/OpenInvCraftbukkit1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_11_R1; 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 class SilentContainerChest extends ContainerChest { // 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); } } }