From 6e5abff66a77294c1cbc9034f3fd31ef3b5b77f0 Mon Sep 17 00:00:00 2001
From: Lorenz <ESs95s3P5z8Pheb>
Date: Fri, 15 Jul 2022 20:56:01 +0200
Subject: fixed MultiFilter so that it does not require all fields anymore

---
 .../java/at/hannibal2/skyhanni/utils/MultiFilter.kt    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni')

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/MultiFilter.kt b/src/main/java/at/hannibal2/skyhanni/utils/MultiFilter.kt
index 13968c0ae..ddb8e4a73 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/MultiFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/MultiFilter.kt
@@ -13,14 +13,16 @@ class MultiFilter {
         startsWith.clear()
         endsWith.clear()
 
-        for (element in hideNpcSell["equals"].asJsonArray) {
-            equals.add(element.asString)
-        }
-        for (element in hideNpcSell["startsWith"].asJsonArray) {
-            startsWith.add(element.asString)
-        }
-        for (element in hideNpcSell["endsWith"].asJsonArray) {
-            endsWith.add(element.asString)
+        fill(hideNpcSell, "equals", equals)
+        fill(hideNpcSell, "startsWith", startsWith)
+        fill(hideNpcSell, "endsWith", endsWith)
+    }
+
+    private fun fill(jsonObject: JsonObject, key: String, list: MutableList<String>) {
+        if (jsonObject.has(key)) {
+            for (element in jsonObject[key].asJsonArray) {
+                list.add(element.asString)
+            }
         }
     }
 
-- 
cgit