diff --git a/Changelog.txt b/Changelog.txt index 4ed552cee..d16ba5df5 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -3,6 +3,7 @@ Version 2.1.112 Fixed a NPE that can occur if a player engages in combat with specific skills before their profile is loaded mcMMO is now more compatible with certain mob stacking plugins Improved behaviour for mob health bars + Archery's Skill Shot bonus damage is now multiplicative instead of additive (nerfing early game skill shot ranks) Version 2.1.111 mcMMO is compatible with the following versions of MC: 1.15 / 1.14.4 / 1.14.3 / 1.14.2 / 1.14.1 / 1.14 / 1.13.2 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 25e5d2ec5..d94bc1d6e 100644 --- a/src/main/java/com/gmail/nossr50/skills/archery/Archery.java +++ b/src/main/java/com/gmail/nossr50/skills/archery/Archery.java @@ -70,6 +70,6 @@ public class Archery { } public static double getDamageBonusPercent(Player player) { - return ((RankUtils.getRank(player, SubSkillType.ARCHERY_SKILL_SHOT)) * AdvancedConfig.getInstance().getSkillShotRankDamageMultiplier()) / 100.0D; + return ((RankUtils.getRank(player, SubSkillType.ARCHERY_SKILL_SHOT)) * (AdvancedConfig.getInstance().getSkillShotRankDamageMultiplier()) / 100.0D); } } 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 00610ade5..d29a66c03 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,8 @@ public final class CombatUtils { } if (archeryManager.canSkillShot()) { - finalDamage+=archeryManager.skillShot(initialDamage); + //not additive + finalDamage = archeryManager.skillShot(initialDamage); } if (archeryManager.canDaze(target)) {