diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/libreforge/FilterQuest.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/libreforge/FilterQuest.kt index 2e250ae..acb48b3 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/libreforge/FilterQuest.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/libreforge/FilterQuest.kt @@ -1,6 +1,7 @@ package com.willfp.ecoquests.libreforge import com.willfp.eco.core.config.interfaces.Config +import com.willfp.eco.util.containsIgnoreCase import com.willfp.ecoquests.api.event.QuestEvent import com.willfp.libreforge.NoCompileData import com.willfp.libreforge.filters.Filter @@ -14,8 +15,6 @@ object FilterQuest : Filter>("quest") { override fun isMet(data: TriggerData, value: Collection, compileData: NoCompileData): Boolean { val event = data.event as? QuestEvent ?: return true - return value.any { questID -> - questID.equals(event.quest.id, ignoreCase = true) - } + return value.containsIgnoreCase(event.quest.id) } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/libreforge/FilterTask.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/libreforge/FilterTask.kt index cb61ce0..f23165f 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/libreforge/FilterTask.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/libreforge/FilterTask.kt @@ -1,6 +1,7 @@ package com.willfp.ecoquests.libreforge import com.willfp.eco.core.config.interfaces.Config +import com.willfp.eco.util.containsIgnoreCase import com.willfp.ecoquests.api.event.QuestEvent import com.willfp.ecoquests.api.event.TaskEvent import com.willfp.libreforge.NoCompileData @@ -15,8 +16,6 @@ object FilterTask : Filter>("task") { override fun isMet(data: TriggerData, value: Collection, compileData: NoCompileData): Boolean { val event = data.event as? TaskEvent ?: return true - return value.any { taskID -> - taskID.equals(event.task.id, ignoreCase = true) - } + return value.containsIgnoreCase(event.task.id) } }