From 215e4556cbbb1b74ef660efbb66bd81cbe017e7b Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Thu, 10 Aug 2023 15:23:43 +0100
Subject: [PATCH] Cleanup

---
 .../kotlin/com/willfp/ecoquests/libreforge/FilterQuest.kt    | 5 ++---
 .../kotlin/com/willfp/ecoquests/libreforge/FilterTask.kt     | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

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<NoCompileData, Collection<String>>("quest") {
     override fun isMet(data: TriggerData, value: Collection<String>, 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<NoCompileData, Collection<String>>("task") {
     override fun isMet(data: TriggerData, value: Collection<String>, 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)
     }
 }