From 499cb0bb4d9f3654892821db8dadd4e8294424d6 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Wed, 28 May 2014 10:53:00 +0800 Subject: [PATCH] Fixed NPE with DS armor. --- .../crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index f9099c3e..2e9d0284 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -172,7 +172,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte @Override public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { if(source.isUnblockable()) { - return null; + return new ArmorProperties(0, 0, armor.getMaxDamage() + 1 - armor.getItemDamage()); } double damageRatio = damageReduceAmount + (getEnergyStored(armor) > 0 ? getPoweredProtectionIncrease(3 - slot) : 0); damageRatio /= 25D;