conflictsWith now checks two ways

2021-03-19 16:52:31 +00:00
parent f0a72b5806
commit 699d4b1e98
1 changed files with 3 additions and 0 deletions
--- 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);
    }