From 6b340838eea8bca50a1b8ff5e332c495809acf40 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Fri, 26 Jun 2020 15:00:52 -0700 Subject: [PATCH] Use the correct default repair material for netherite gear --- Changelog.txt | 2 ++ .../com/gmail/nossr50/datatypes/skills/MaterialType.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index d83a69412..64fe2acc2 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,6 +1,8 @@ Version 2.1.130 Fixed a bug that prevented Repair from working on the new Netherite weapons/armors + Fixed a bug where Netherite gear used Gold Ingots to repair instead of Netherite Scraps (by default) mcMMO will now run a script to fix a misspelling of netherite in repair/salvage configs (script only runs once and then never again) + mcMMO will produce a fake ItemDamageEvent before damaging axes in Tree Feller execution NOTES: diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java b/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java index 2e6157a1f..27369419b 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java @@ -37,10 +37,10 @@ public enum MaterialType { return Material.DIAMOND; case NETHER: - if(Material.getMaterial("netherite_scrap") != null) - return Material.getMaterial("netherite_scrap"); + if(Material.getMaterial("NETHERITE_SCRAP") != null) + return Material.getMaterial("NETHERITE_SCRAP"); else - return Material.GOLD_INGOT; + return Material.DIAMOND; case OTHER: default: