From b684aebdaa92db0a6d7ea71bb94446027f989017 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Thu, 12 May 2016 15:44:12 -0400 Subject: [PATCH] Fixed the Living Armour so that it wouldn't get damaged by self-sacrificing when you had upgrades that mitigate unblockable sources. --- changelog.txt | 1 + .../WayofTime/bloodmagic/item/armour/ItemLivingArmour.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/changelog.txt b/changelog.txt index 40a66268..a6731f5c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -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 - 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 diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index c38c94e3..1ffaffed 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -217,6 +217,11 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP { if (this == ModItems.livingArmourChest) { + if (source.isUnblockable()) + { + return; + } + if (damage > this.getMaxDamage(stack) - this.getDamage(stack)) { //TODO: Syphon a load of LP.