lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finalized Solar Powered perk. Worked a bit more on Grim Reaper's Sprint.

Browse source
This commit is contained in:
WayofTime 2016-02-11 14:10:43 -05:00
parent 8feae53462
commit 69eb621fc8
11 changed files with 223 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
View file

@ -104,7 +104,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IRevea
for (Entry<String, LivingArmourUpgrade> entry : armour.upgradeMap.entrySet())
{
LivingArmourUpgrade upgrade = entry.getValue();
remainder *= (1 - upgrade.getArmourProtection(source));
remainder *= (1 - upgrade.getArmourProtection(player, source));
/*
* Just as a side note, if one upgrade provides
* upgrade.getArmourProtection(source) = 0.5, the
@ -320,7 +320,8 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IRevea
}
@Override
public boolean showIngamePopups(ItemStack stack, EntityLivingBase entityLivingBase) {
public boolean showIngamePopups(ItemStack stack, EntityLivingBase entityLivingBase)
{
stack = NBTHelper.checkNBT(stack);
LivingArmour armor = getLivingArmour(stack);