From cbac56e199b9c22f940a0053167e4289375309dd Mon Sep 17 00:00:00 2001 From: slipcor Date: Thu, 15 Dec 2016 20:08:00 +0100 Subject: [PATCH] address github issue #302 (joining with empty inventory) --- .../MobArena/util/inventory/InventoryManager.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/garbagemule/MobArena/util/inventory/InventoryManager.java b/src/main/java/com/garbagemule/MobArena/util/inventory/InventoryManager.java index a0ac50f..2d6620e 100644 --- a/src/main/java/com/garbagemule/MobArena/util/inventory/InventoryManager.java +++ b/src/main/java/com/garbagemule/MobArena/util/inventory/InventoryManager.java @@ -108,15 +108,14 @@ public class InventoryManager ItemStack[] inventory = p.getInventory().getContents(); ItemStack[] armor = p.getInventory().getArmorContents(); - // For inventory, check for null + // Check for null or id 0, or AIR for (ItemStack stack : inventory) { - if (stack != null) + if (stack != null && stack.getTypeId() != 0) return false; } - - // For armor, check for id 0, or AIR + for (ItemStack stack : armor) { - if (stack.getTypeId() != 0) + if (stack != null && stack.getTypeId() != 0) return false; }