From 699d4b1e9826e494d55034552cc0280b776032e4 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 19 Mar 2021 16:52:31 +0000 Subject: [PATCH] conflictsWith now checks two ways --- .../java/com/willfp/ecoenchants/enchantments/EcoEnchant.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java index a6157084..fcfd63ac 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java @@ -363,6 +363,9 @@ public abstract class EcoEnchant extends Enchantment implements Listener, Watche */ @Override public boolean conflictsWith(@NotNull final Enchantment enchantment) { + if (enchantment instanceof EcoEnchant) { + return conflicts.contains(enchantment) || ((EcoEnchant) enchantment).conflicts.contains(this); + } return conflicts.contains(enchantment); }