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 081c8f6..bf1d01e 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 @@ -41,9 +41,6 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -/* -TODO: Split off ArmorSet between two separate armorset objects (one advanced, one not) - */ public class ArmorSet { /** * Instance of EcoArmor. @@ -132,7 +129,7 @@ public class ArmorSet { for (Config cfg : this.getConfig().getSubsections("advancedEffects")) { ConfiguredEffect conf = Effects.compile(cfg, "Armor Set " + this.name + " (Advanced)"); if (conf != null) { - effects.add(conf); + advancedEffects.add(conf); } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/sets/AdvancedHolder.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/sets/AdvancedHolder.kt index 790c5e0..dde6ef7 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/sets/AdvancedHolder.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/sets/AdvancedHolder.kt @@ -4,6 +4,7 @@ import com.willfp.libreforge.Holder import com.willfp.libreforge.conditions.ConfiguredCondition import com.willfp.libreforge.effects.ConfiguredEffect -class AdvancedHolder(override val conditions: Set, override val effects: Set) : - Holder { +class AdvancedHolder( + override val conditions: Set, + override val effects: Set) : Holder { } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/sets/RegularHolder.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/sets/RegularHolder.kt index 799b983..e851e4f 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/sets/RegularHolder.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/sets/RegularHolder.kt @@ -4,6 +4,7 @@ import com.willfp.libreforge.Holder import com.willfp.libreforge.conditions.ConfiguredCondition import com.willfp.libreforge.effects.ConfiguredEffect -class RegularHolder(override val conditions: Set, override val effects: Set) : - Holder { +class RegularHolder( + override val conditions: Set, + override val effects: Set) : Holder { }