From 31d70a60726831b11ed107b6e182c7541435ab9c Mon Sep 17 00:00:00 2001 From: nossr50 Date: Sun, 14 Dec 2025 13:58:31 -0800 Subject: [PATCH] spears update --- Changelog.txt | 3 ++- src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog.txt b/Changelog.txt index 6a0d3448a..905cccf38 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,7 +1,7 @@ Version 2.2.046 Added Spears combat skill Added Spears to repair.vanilla.yml and salvage.vanilla.yml (see notes) - Added permissions related to Spears + Added various permissions related to Spears Added /spears skill command Added Nautilus to taming XP in experience.yml Added Camel_Husk to taming XP in experience.yml @@ -13,6 +13,7 @@ Version 2.2.046 (Codebase) Database related errors are now more descriptive and have had their logging improved NOTES: + This update had a lot of changes behind the scenes, please report any bugs you find to our GitHub issues page! You will need to manually update repair.vanilla.yml and salvage.vanilla.yml to get support for Spears, or... If you want to update salvage/repair configs the easy way, you simply can delete these config files to have mcMMO regenerate them with the new entries. If you don't want to delete them, you can find the default values for these config files in the defaults folder at plugins\mcMMO\defaults after running this mcMMO update at least once. 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 9b7836d90..056a0de9c 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -350,6 +350,7 @@ public final class CombatUtils { } final SpearsManager spearsManager = mmoPlayer.getSpearsManager(); + if (canUseSubSkill(player, SubSkillType.SPEARS_SPEAR_MASTERY)) { boostedDamage += spearsManager.getSpearMasteryBonusDamage() * mmoPlayer.getAttackStrength();