Fixed stack overflow error

LangZongz · Jan 6, 2024 · 5c6e6ee · 5c6e6ee
1 parent 3f3b836
commit 5c6e6ee
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...lin/com/willfp/ecoenchants/proxy/v1_20_R3/registration/ModifiedVanillaCraftEnchantment.kt b/...lin/com/willfp/ecoenchants/proxy/v1_20_R3/registration/ModifiedVanillaCraftEnchantment.kt
@@ -12,7 +12,12 @@ class ModifiedVanillaCraftEnchantment(
     override fun getMaxLevel(): Int = this.vanillaEnchantmentData?.maxLevel ?: super.getMaxLevel()
 
     override fun conflictsWith(other: org.bukkit.enchantments.Enchantment): Boolean {
+        val otherConflicts = when(other) {
+            is ModifiedVanillaCraftEnchantment -> other.vanillaEnchantmentData?.conflicts?.contains(this.key) == true
+            else -> other.conflictsWith(this)
+        }
+
         return this.vanillaEnchantmentData?.conflicts?.contains(other.key) ?: super.conflictsWith(other)
-                || other.conflictsWith(this)
+                || otherConflicts
     }
 }