diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 86265a2..b771a80 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/plugin.yml b/src/plugin.yml index 744b95b..16bb68d 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,6 +1,6 @@ name: TwosideKeeper main: sig.plugin.TwosideKeeper.TwosideKeeper -version: 3.7.3-alpha4 +version: 3.7.3-alpha5 commands: money: description: Tells the player the amount of money they are holding. diff --git a/src/sig/plugin/TwosideKeeper/NewCombat.java b/src/sig/plugin/TwosideKeeper/NewCombat.java index 4885b60..e34c93b 100644 --- a/src/sig/plugin/TwosideKeeper/NewCombat.java +++ b/src/sig/plugin/TwosideKeeper/NewCombat.java @@ -86,14 +86,13 @@ public class NewCombat { double finaldmg = 0.0; if (shooter!=null) { finaldmg += calculateTotalDamage(target, damager); - finaldmg = calculateAbsorptionHearts(target, finaldmg); if (shooter instanceof Player) { Player p = (Player)shooter; playerPerformMiscActions(p,target); if (target instanceof Monster) { Monster m = (Monster)target; setMonsterTarget(m,p); - provokeMonster(m,p); + provokeMonster(m,p); } } } @@ -126,7 +125,8 @@ public class NewCombat { playerAddArtifactEXP(target,finaldmg); applyOnHitMobEffects(target,damager); - return CalculateDamageReduction(finaldmg,target,damager); + finaldmg = CalculateDamageReduction(finaldmg,target,damager); + return calculateAbsorptionHearts(target, finaldmg); } static double calculateTotalDamage(LivingEntity target, Entity damager) { @@ -1295,7 +1295,6 @@ public class NewCombat { if (target.hasPotionEffect(PotionEffectType.ABSORPTION)) { int abslv = GenericFunctions.getPotionEffectLevel(PotionEffectType.ABSORPTION, target)+1; double healthabs = abslv*4; //The amount of health absorbed per level. - if (DamageIsSmallerThanAbsorptionAmount(finaldmg,healthabs)) { SubtractDamageFromAbsorption(target, finaldmg,healthabs); return 0.0; //Final damage becomes 0. @@ -1304,6 +1303,7 @@ public class NewCombat { return finaldmg-healthabs; } } + TwosideKeeper.log("New final damage is "+finaldmg, 2); return finaldmg; }