From 3241f60e765444df8e353f7c8baee6fd374ae3fc Mon Sep 17 00:00:00 2001 From: Auxilor Date: Mon, 22 Mar 2021 13:49:14 +0000 Subject: [PATCH] Fixed default tier working on raw string instead of config lookup --- .../src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java | 2 +- .../src/main/java/com/willfp/ecoarmor/upgrades/Tiers.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java index 721aa1e..c6c6767 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java @@ -294,7 +294,7 @@ public class ArmorSet { itemStack.setItemMeta(meta); ArmorUtils.setAdvanced(itemStack, advanced); - ArmorUtils.setTier(itemStack, Tiers.getByName(pieceName + ".default-tier")); + ArmorUtils.setTier(itemStack, Tiers.getByName(this.getConfig().getString(pieceName + ".default-tier"))); if (advanced) { RecipeParts.registerRecipePart(PLUGIN.getNamespacedKeyFactory().create("set_" + name.toLowerCase() + "_" + pieceName + "_advanced"), new ComplexRecipePart(test -> { diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/Tiers.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/Tiers.java index 9e85aaf..c636476 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/Tiers.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/Tiers.java @@ -56,9 +56,6 @@ public class Tiers { * @return The matching {@link Tiers}, or null if not found. */ public static Tier getByName(@Nullable final String name) { - if (name != null && name.equalsIgnoreCase("default")) { - return DEFAULT; - } return BY_NAME.get(name); } @@ -109,7 +106,6 @@ public class Tiers { } static { - addNewTier(DEFAULT); reload(); } }