- 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
This commit is contained in:
WayofTime 2016-05-12 14:51:42 -04:00
parent 328b566064
commit e363ba8ffb
5 changed files with 25 additions and 5 deletions

View file

@ -483,13 +483,15 @@ public class EventHandler
}
@SubscribeEvent
public void onTeleposeEntity(TeleposeEvent.Ent event) {
public void onTeleposeEntity(TeleposeEvent.Ent event)
{
if (ConfigHandler.teleposerBlacklistEntity.contains(event.entity.getClass().getSimpleName()))
event.setCanceled(true);
}
@SubscribeEvent
public void onTeleposeEntityPost(TeleposeEvent.Ent.Post event) {
public void onTeleposeEntityPost(TeleposeEvent.Ent.Post event)
{
event.entity.timeUntilPortal = 5;
}
@ -577,7 +579,7 @@ public class EventHandler
LivingArmour armour = ItemLivingArmour.armourMap.get(chestStack);
if (armour != null)
{
StatTrackerSelfSacrifice.incrementCounter(armour);
StatTrackerSelfSacrifice.incrementCounter(armour, event.healthDrained / 2);
LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.selfSacrifice", chestStack);
if (upgrade instanceof LivingArmourUpgradeSelfSacrifice)