From 16381383cbc26e4a8f89addf1431631293d2257a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Jul 2016 20:18:16 -0500 Subject: [PATCH] Fix wills not applying. Closes #372 --- .../item/equipment/armor/terrasteel/ItemTerrasteelHelm.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 319a63d23..748e4c549 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -22,6 +22,7 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; @@ -48,6 +49,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc public ItemTerrasteelHelm(String name) { super(EntityEquipmentSlot.HEAD, name); + MinecraftForge.EVENT_BUS.register(this); } @Override @@ -123,7 +125,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc EntityPlayer player = (EntityPlayer) attacker; if(hasArmorSet(player)) { boolean crit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(MobEffects.BLINDNESS) && !player.isRiding(); - ItemStack stack = player.inventory.armorItemInSlot(3); + ItemStack stack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); if(crit && stack != null && stack.getItem() instanceof ItemTerrasteelHelm) { boolean ahrim = hasAncientWill(stack, 0); boolean dharok = hasAncientWill(stack, 1);