diff --git a/impl/LegacyEcoEnchant/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java b/impl/LegacyEcoEnchant/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java index 76e3324..3d02666 100644 --- a/impl/LegacyEcoEnchant/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java +++ b/impl/LegacyEcoEnchant/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java @@ -11,10 +11,6 @@ import java.util.Set; */ public class EcoEnchant { - public boolean getConflictsWithEverything() { - return false; - } - public boolean conflictsWith(@NotNull Enchantment enchant) { return false; } diff --git a/src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CAEcoEnchant.java b/src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CAEcoEnchant.java index 0d85ffd..b3a4635 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CAEcoEnchant.java +++ b/src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CAEcoEnchant.java @@ -22,19 +22,19 @@ public class CAEcoEnchant extends CABukkitEnchantment implements AdditionalTestE @Override public boolean isEnchantConflict(@NotNull Map enchantments, @NotNull Material itemMat) { - if(!enchantments.isEmpty()) { - if (this.ecoEnchant.getConflictsWithEverything()) { + if(enchantments.isEmpty()) return false; + + if (this.ecoEnchant.getConflictsWithEverything()) { + return true; + } + + for (CAEnchantment other : enchantments.keySet()) { + if(other instanceof CABukkitEnchantment otherVanilla + && this.ecoEnchant.conflictsWith(otherVanilla.getEnchant())){ return true; } - - for (CAEnchantment other : enchantments.keySet()) { - if(other instanceof CABukkitEnchantment otherVanilla - && this.ecoEnchant.conflictsWith(otherVanilla.getEnchant())){ - return true; - } - } - } + return false; } diff --git a/src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CALegacyEcoEnchant.java b/src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CALegacyEcoEnchant.java index c1ac3cf..1c07a05 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CALegacyEcoEnchant.java +++ b/src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CALegacyEcoEnchant.java @@ -23,16 +23,12 @@ public class CALegacyEcoEnchant extends CABukkitEnchantment implements Additiona @Override public boolean isEnchantConflict(@NotNull Map enchantments, @NotNull Material itemMat) { - if (!enchantments.isEmpty()) { - if (this.ecoEnchant.getConflictsWithEverything()) { - return true; - } + if (enchantments.isEmpty()) return false; - for (CAEnchantment other : enchantments.keySet()) { - if (other instanceof CABukkitEnchantment otherVanilla - && this.ecoEnchant.conflictsWith(otherVanilla.getEnchant())) { - return true; - } + for (CAEnchantment other : enchantments.keySet()) { + if (other instanceof CABukkitEnchantment otherVanilla + && this.ecoEnchant.conflictsWith(otherVanilla.getEnchant())) { + return true; } }