Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows

Changelog.txt

@@ -48,6 +48,9 @@ Version 2.2.000
 
     Notes:
     These are the first new skills that I've written for mcMMO in about 9 years, I'll be listening closely to feedback and tweaking them often.
+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
 

src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java

@@ -1072,6 +1072,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();