From d1cf08c6baea3ae6fd8386e2c22e1e9750fe4d8a Mon Sep 17 00:00:00 2001 From: t00thpick1 Date: Sun, 20 Mar 2016 12:47:27 -0500 Subject: [PATCH] Null check. Fixes #2840 #2842 --- src/main/java/com/gmail/nossr50/skills/axes/Axes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gmail/nossr50/skills/axes/Axes.java b/src/main/java/com/gmail/nossr50/skills/axes/Axes.java index d64464ab1..5268e7865 100644 --- a/src/main/java/com/gmail/nossr50/skills/axes/Axes.java +++ b/src/main/java/com/gmail/nossr50/skills/axes/Axes.java @@ -25,7 +25,7 @@ public class Axes { protected static boolean hasArmor(LivingEntity target) { for (ItemStack itemStack : target.getEquipment().getArmorContents()) { - if (ItemUtils.isArmor(itemStack)) { + if (itemStack != null && ItemUtils.isArmor(itemStack)) { return true; } }