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

Fixed the Living Armour so that it wouldn't get damaged by self-sacrificing when you had upgrades that mitigate unblockable sources.

Browse source
This commit is contained in:
WayofTime 2016-05-12 15:44:12 -04:00
parent e363ba8ffb
commit b684aebdaa
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.txt
View file

@ -3,6 +3,7 @@ Version 2.0.0-38
------------------------------------------------------ ------------------------------------------------------
- Fixed it so that the Sentient weaponry is actually repairable using any demon will crystals in an anvil - Fixed it so that the Sentient weaponry is actually repairable using any demon will crystals in an anvil
- Changed the stat tracker for Tough Palms so that it counts number of hearts sacrificed, not number of sacrifices - Changed the stat tracker for Tough Palms so that it counts number of hearts sacrificed, not number of sacrifices
- Fixed the Living Armour so that it wouldn't get damaged by self-sacrificing when you had upgrades that mitigate unblockable sources.
------------------------------------------------------ ------------------------------------------------------
Version 2.0.0-37 Version 2.0.0-37

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

@ -217,6 +217,11 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
{ {
if (this == ModItems.livingArmourChest) if (this == ModItems.livingArmourChest)
{ {
if (source.isUnblockable())
{
return;
}
if (damage > this.getMaxDamage(stack) - this.getDamage(stack)) if (damage > this.getMaxDamage(stack) - this.getDamage(stack))
{ {
//TODO: Syphon a load of LP. //TODO: Syphon a load of LP.