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

Updated forge, did random stuff to the armour before realizing issues with armour calculations

Browse source
This commit is contained in:
WayofTime 2016-04-06 21:04:50 -04:00
parent b56bbef29e
commit aa480af518
5 changed files with 194 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java
View file

@ -85,6 +85,7 @@ import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
import WayofTime.bloodmagic.item.armour.ItemSentientArmour;
import WayofTime.bloodmagic.item.gear.ItemPackSacrifice;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerArrowProtect;
import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerArrowShot;
import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerDigging;
import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerExperience;
@ -601,6 +602,10 @@ 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))
{
@ -619,6 +624,11 @@ public class EventHandler
{
StatTrackerFallProtect.incrementCounter(armour, amount);
}
if (source.isProjectile())
{
StatTrackerArrowProtect.incrementCounter(armour, amount);
}
}
} else
{