From 7d9312b2f8ffaadeb2e33b059281edc69a47dca5 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Thu, 7 Apr 2016 10:07:55 -0400 Subject: [PATCH] Reverted changes to Living Armour - waiting on change to Forge's armour to balance properly. --- .../item/armour/ItemLivingArmour.java | 22 +++++++++---------- .../bloodmagic/util/handler/EventHandler.java | 4 ---- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index 125156ee..a09c4c46 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -69,17 +69,17 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP } } - public double getRemainderForDamage(double damage, double plating) //TODO: Add plating, which shifts the damage - { - if (damage <= 0) - { - return 1; - } - - double protectionAmount = 1 - Math.max(3, 15 - damage / 2) / 25; //This puts the base armour protection at vanilla iron level - - return 0; - } +// public double getRemainderForDamage(double damage, double plating) //TODO: Add plating, which shifts the damage +// { +// if (damage <= 0) +// { +// return 1; +// } +// +// double protectionAmount = 1 - Math.max(3, 15 - damage / 2) / 25; //This puts the base armour protection at vanilla iron level +// +// return 0; +// } @Override public ArmorProperties getProperties(EntityLivingBase player, ItemStack stack, DamageSource source, double damage, int slot) diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java index d30541b1..c3f59901 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java @@ -602,10 +602,6 @@ public class EventHandler { EntityPlayer attackedPlayer = (EntityPlayer) attackedEntity; - System.out.println("Damage: " + event.getAmount()); - - System.out.println("New damage: " + net.minecraftforge.common.ISpecialArmor.ArmorProperties.applyArmor(attackedPlayer, attackedPlayer.inventory.armorInventory, event.getSource(), event.getAmount())); - // Living Armor Handling if (LivingArmour.hasFullSet(attackedPlayer)) {