Almost ready for final 1.2.0 push

This commit is contained in:
WayofTime 2014-10-13 10:33:43 -04:00
parent 4a1f13d988
commit 3d6d7bcdd6
12 changed files with 136 additions and 46 deletions

View file

@ -180,7 +180,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles,ISpecialAr
if(player.isPotionActive(AlchemicalWizardry.customPotionSoulHarden))
{
int i = player.getActivePotionEffect(AlchemicalWizardry.customPotionSoulHarden).getAmplifier() + 1;
damageAmount /= (1 - i*0.1);
damageAmount /= Math.max((1 - i*0.1), 0.1);
}else
{
damageAmount *= 0.9;
@ -309,8 +309,8 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles,ISpecialAr
{
return "alchemicalwizardry:models/armor/BloodArmour_WIP.png";
}
//TODO Make the armour invisible when the player has Invisibility on.
if (entity instanceof EntityLivingBase)
if (entity instanceof EntityLivingBase)
{
if (this.getIsInvisible(stack))
{