diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/EcoArmorPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/EcoArmorPlugin.kt index 61794bb..ee26f4f 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/EcoArmorPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/EcoArmorPlugin.kt @@ -17,10 +17,13 @@ import com.willfp.ecoarmor.upgrades.CrystalListener import com.willfp.ecoarmor.upgrades.TierArgParser import com.willfp.ecoarmor.upgrades.Tiers import com.willfp.ecoarmor.util.DiscoverRecipeListener +import com.willfp.libreforge.SimpleProvidedHolder import com.willfp.libreforge.conditions.Conditions import com.willfp.libreforge.loader.LibreforgePlugin import com.willfp.libreforge.loader.configs.ConfigCategory import com.willfp.libreforge.registerHolderProvider +import com.willfp.libreforge.registerSpecificHolderProvider +import org.bukkit.entity.Player import org.bukkit.event.Listener class EcoArmorPlugin : LibreforgePlugin() { @@ -34,7 +37,9 @@ class EcoArmorPlugin : LibreforgePlugin() { } override fun handleEnable() { - registerHolderProvider { ArmorUtils.getActiveHolders(it) } + registerSpecificHolderProvider { + ArmorUtils.getActiveHolders(it) + } } override fun loadConfigCategories(): List { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/libreforge/ConditionIsWearingSet.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/libreforge/ConditionIsWearingSet.kt index 14839d7..99f47c6 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/libreforge/ConditionIsWearingSet.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/libreforge/ConditionIsWearingSet.kt @@ -2,9 +2,12 @@ package com.willfp.ecoarmor.libreforge import com.willfp.eco.core.config.interfaces.Config import com.willfp.ecoarmor.sets.ArmorUtils +import com.willfp.libreforge.Dispatcher import com.willfp.libreforge.NoCompileData +import com.willfp.libreforge.ProvidedHolder import com.willfp.libreforge.arguments import com.willfp.libreforge.conditions.Condition +import com.willfp.libreforge.get import org.bukkit.entity.Player object ConditionIsWearingSet : Condition("is_wearing_set") { @@ -12,7 +15,14 @@ object ConditionIsWearingSet : Condition("is_wearing_set") { require("set", "You must specify the set name!") } - override fun isMet(player: Player, config: Config, compileData: NoCompileData): Boolean { + override fun isMet( + dispatcher: Dispatcher<*>, + config: Config, + holder: ProvidedHolder, + compileData: NoCompileData + ): Boolean { + val player = dispatcher.get() ?: return false + return ArmorUtils.getSetOnPlayer(player)?.id == config.getString("set") } } diff --git a/gradle.properties b/gradle.properties index f166be9..84ccf65 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ #libreforge-updater -#Sun Nov 19 14:14:21 GMT 2023 +#Tue Nov 21 22:41:37 GMT 2023 kotlin.code.style=official -libreforge-version=4.43.1 -version=8.43.1 +libreforge-version=4.44.0 +version=8.44.0