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

address github issue #302 (joining with empty inventory)

Browse Source
This commit is contained in:
slipcor committed 2016-12-15 20:08:00 +01:00
1 parent 3b88b889d6
commit cbac56e199
1 file changed
+4 -5
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;
} }