From ceaff0c8621f9e780fbe95688a5e91e69353e65f Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 14 Jan 2020 20:09:41 -0800 Subject: [PATCH] SkillShot tweaks --- src/main/java/com/gmail/nossr50/skills/archery/Archery.java | 2 +- src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/skills/archery/Archery.java b/src/main/java/com/gmail/nossr50/skills/archery/Archery.java index d94bc1d6e..9d3634e46 100644 --- a/src/main/java/com/gmail/nossr50/skills/archery/Archery.java +++ b/src/main/java/com/gmail/nossr50/skills/archery/Archery.java @@ -66,7 +66,7 @@ public class Archery { { double damageBonusPercent = getDamageBonusPercent(player); double newDamage = oldDamage + (oldDamage * damageBonusPercent); - return Math.min(newDamage, Archery.skillShotMaxBonusDamage); + return Math.min(newDamage, (oldDamage + Archery.skillShotMaxBonusDamage)); } public static double getDamageBonusPercent(Player player) { diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java index d29a66c03..bf5539c0b 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -248,7 +248,7 @@ public final class CombatUtils { } if (archeryManager.canSkillShot()) { - //not additive + //Not Additive finalDamage = archeryManager.skillShot(initialDamage); }