EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-04 02:53:43 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
nossr50
2020-07-30 19:24:20 -07:00
parent df7c9e0b1c d490f4fd60
commit 03f1733387
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog.txt
View File

@@ -48,6 +48,9 @@ Version 2.2.000
Notes: 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. 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 Version 2.1.137
Added some code to avoid NPE errors when checking armor on entities Added some code to avoid NPE errors when checking armor on entities

2
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@@ -1072,6 +1072,8 @@ public final class CombatUtils {
} }
else if (ItemUtils.isDiamondTool(inHand)) { else if (ItemUtils.isDiamondTool(inHand)) {
tier = 4; tier = 4;
} else if (ItemUtils.isNetheriteTool(inHand)) {
tier = 5;
} }
else if (mcMMO.getModManager().isCustomTool(inHand)) { else if (mcMMO.getModManager().isCustomTool(inHand)) {
tier = mcMMO.getModManager().getTool(inHand).getTier(); tier = mcMMO.getModManager().getTool(inHand).getTier();