From 3f3b836232de689dfaf89c9f4a4028439abe01d0 Mon Sep 17 00:00:00 2001 From: Will FP Date: Sat, 6 Jan 2024 09:20:37 +0000 Subject: [PATCH 1/3] libreforge-updater --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8b77b7b672..2e794fc9c9 100644 --- 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.1 From 5c6e6ee49ef4416a3d25e36eca4fa6ee87d9aa43 Mon Sep 17 00:00:00 2001 From: Will FP Date: Sat, 6 Jan 2024 10:01:36 +0000 Subject: [PATCH 2/3] Fixed stack overflow error --- .../registration/ModifiedVanillaCraftEnchantment.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eco-core/core-nms/v1_20_R3/src/main/kotlin/com/willfp/ecoenchants/proxy/v1_20_R3/registration/ModifiedVanillaCraftEnchantment.kt b/eco-core/core-nms/v1_20_R3/src/main/kotlin/com/willfp/ecoenchants/proxy/v1_20_R3/registration/ModifiedVanillaCraftEnchantment.kt index 23c30eff7a..2aed439234 100644 --- a/eco-core/core-nms/v1_20_R3/src/main/kotlin/com/willfp/ecoenchants/proxy/v1_20_R3/registration/ModifiedVanillaCraftEnchantment.kt +++ b/eco-core/core-nms/v1_20_R3/src/main/kotlin/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 } } From 56e14fadb533a402a44c0cdb23b1fdb3b824f5f5 Mon Sep 17 00:00:00 2001 From: Will FP Date: Sat, 6 Jan 2024 10:01:46 +0000 Subject: [PATCH 3/3] Updated to 12.0.2 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2e794fc9c9..4ba461abf5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,4 @@ #Sat Jan 06 09:20:37 GMT 2024 kotlin.code.style=official libreforge-version=4.53.1 -version=12.0.1 +version=12.0.2