From a05c0157320ec313532c6ca77b752bc938d1a0cc Mon Sep 17 00:00:00 2001 From: nossr50 Date: Thu, 30 Jul 2020 16:12:50 -0700 Subject: [PATCH 1/2] Fix Netherite not working for certain skills (like Skull Splitter) --- pom.xml | 2 +- src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f77c819f9..c3b746198 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.137 + 2.1.138-SNAPSHOT mcMMO https://github.com/mcMMO-Dev/mcMMO 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 07f0c392d..d04ec30fb 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -980,6 +980,8 @@ public final class CombatUtils { } else if (ItemUtils.isDiamondTool(inHand)) { tier = 4; + } else if (ItemUtils.isNetheriteTool(inHand)) { + tier = 5; } else if (mcMMO.getModManager().isCustomTool(inHand)) { tier = mcMMO.getModManager().getTool(inHand).getTier(); From d490f4fd6007806ad6c06e074e52231ea94a878e Mon Sep 17 00:00:00 2001 From: nossr50 Date: Thu, 30 Jul 2020 16:28:47 -0700 Subject: [PATCH 2/2] 2.1.138 --- Changelog.txt | 3 +++ pom.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Changelog.txt b/Changelog.txt index 9f87c496c..e2a567466 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,6 @@ +Version 2.1.138 + Fixed a bug where Netherite weapons/tools/armor weren't applying correct values in some skill calculations + Version 2.1.137 Added some code to avoid NPE errors when checking armor on entities diff --git a/pom.xml b/pom.xml index c3b746198..92c633a5f 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.138-SNAPSHOT + 2.1.138 mcMMO https://github.com/mcMMO-Dev/mcMMO