Merge branch 'Auxilor:master' into master

LangZongz · Jan 6, 2024 · 7b9a77b · 7b9a77b
2 parents ae2abed + 56e14fa
commit 7b9a77b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
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
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 #libreforge-updater
-#Wed Dec 27 14:18:03 CET 2023
+#Sat Jan 06 09:20:37 GMT 2024
 kotlin.code.style=official
-libreforge-version=4.53.0
-version=12.0.0
+libreforge-version=4.53.1
+version=12.0.2