From f9d0ab39af756c9dc0e7ae259ac292fb576234ea Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 30 Sep 2017 13:03:01 +0100 Subject: [PATCH] Add some null checks to armorset verification. Closes #2379 --- .../item/equipment/armor/manasteel/ItemManasteelArmor.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 943c64946..b8f284c00 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -202,6 +202,9 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } public boolean hasArmorSetItem(EntityPlayer player, int i) { + if(player == null || player.inventory == null || player.inventory.armorInventory == null) + return false; + ItemStack stack = player.inventory.armorInventory.get(3 - i); if(stack.isEmpty()) return false;