skywalker3200/MobArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #328 from slipcor/empty-inventory

Browse Source 
Always check for both null stacks and "air stacks" (ItemStack ID 0) when checking for empty inventories. Fixes #302
This commit is contained in:
garbagemule
2016-12-17 01:43:46 +01:00
committed by GitHub
parent bc7c321d28 cbac56e199
commit 65f33ae1a4
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/garbagemule/MobArena/util/inventory/InventoryManager.java
+4 -5
View File
@@ -108,15 +108,14 @@ public class InventoryManager
ItemStack[] inventory = p.getInventory().getContents(); ItemStack[] inventory = p.getInventory().getContents();
ItemStack[] armor = p.getInventory().getArmorContents(); ItemStack[] armor = p.getInventory().getArmorContents();
// For inventory, check for null // Check for null or id 0, or AIR
for (ItemStack stack : inventory) { for (ItemStack stack : inventory) {
if (stack != null) if (stack != null && stack.getTypeId() != 0)
return false; return false;
} }
// For armor, check for id 0, or AIR
for (ItemStack stack : armor) { for (ItemStack stack : armor) {
if (stack.getTypeId() != 0) if (stack != null && stack.getTypeId() != 0)
return false; return false;
} }