minster586/OpenInv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Fix potentially server-crashing NPE

Browse Source 
Whoops.
This commit is contained in:
Jikoo
2016-11-17 03:22:24 -05:00
parent e100dff6ab
commit 2e41b4bd45
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
OpenInvPlugin/src/main/resources/plugin.yml → OpenInv/src/main/resources/plugin.yml
View File

5
OpenInvCraftbukkit1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SilentContainerChest.java
View File

@@ -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.ContainerChest;
import net.minecraft.server.v1_11_R1.EntityHuman; import net.minecraft.server.v1_11_R1.EntityHuman;
import net.minecraft.server.v1_11_R1.IInventory; import net.minecraft.server.v1_11_R1.IInventory;
import net.minecraft.server.v1_11_R1.ItemStack;
import net.minecraft.server.v1_11_R1.PlayerInventory; import net.minecraft.server.v1_11_R1.PlayerInventory;
public class SilentContainerChest extends ContainerChest { public class SilentContainerChest extends ContainerChest {
@@ -37,9 +38,9 @@ public class SilentContainerChest extends ContainerChest {
// Don't send close signal twice, might screw up // Don't send close signal twice, might screw up
PlayerInventory playerinventory = entityHuman.inventory; PlayerInventory playerinventory = entityHuman.inventory;
if (playerinventory.getCarried() != null) { if (!playerinventory.getCarried().isEmpty()) {
entityHuman.drop(playerinventory.getCarried(), false); entityHuman.drop(playerinventory.getCarried(), false);
playerinventory.setCarried(null); playerinventory.setCarried(ItemStack.a);
} }
} }
} }