[Conditions] Fix mistake from past commits not loading true/false val…

…ues if not wrapped in ""
NEZNAMY · Nov 10, 2024 · 2f00aa7 · 2f00aa7
1 parent 07f5dc6
commit 2f00aa7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/shared/src/main/java/me/neznamy/tab/shared/config/file/ConfigurationSection.java b/shared/src/main/java/me/neznamy/tab/shared/config/file/ConfigurationSection.java
@@ -104,7 +104,7 @@ public Object getObject(@NotNull String path, @NotNull Object defaultValue) {
 
     @Nullable
     private <T> T getNullable(@NotNull String path, @NotNull Class<T> clazz) {
-        return evaluateNullable(map.get(path), path, clazz);
+        return evaluateNullable(get(path), path, clazz);
     }
 
     @Nullable
@@ -119,7 +119,7 @@ private <T> T evaluateNullable(@Nullable Object value, @NotNull String path, @No
 
     @NotNull
     private <T> T getRequired(@NotNull String path, @NotNull T defaultValue, @NotNull Class<T> clazz) {
-        return evaluateRequired(map.get(path), path, defaultValue, clazz);
+        return evaluateRequired(get(path), path, defaultValue, clazz);
     }
 
     @NotNull
@@ -137,6 +137,14 @@ private <T> T evaluateRequired(@Nullable Object value, @NotNull String path, @No
         return (T) value;
     }
 
+    @Nullable
+    private Object get(@NotNull String key) {
+        for (Map.Entry<Object, Object> entry : map.entrySet()) {
+            if (key.equalsIgnoreCase(entry.getKey().toString())) return entry.getValue();
+        }
+        return null;
+    }
+
     @NotNull
     public Collection<Object> getKeys() {
         return map.keySet();

diff --git a/shared/src/main/java/me/neznamy/tab/shared/placeholders/conditions/ConditionsSection.java b/shared/src/main/java/me/neznamy/tab/shared/placeholders/conditions/ConditionsSection.java
@@ -66,14 +66,14 @@ public static ConditionDefinition fromSection(@NotNull ConfigurationSection sect
                 list = Collections.emptyList();
             }
             String type = section.getString("type");
-            String yes = section.getString("true");
+            Object yes = section.getObject("true");
             if (yes == null) yes = "true";
-            String no = section.getString("false");
+            Object no = section.getObject("false");
             if (no == null) no = "false";
             if (list.size() >= 2 && type == null) {
                 section.startupWarn(String.format("Condition \"%s\" has multiple conditions defined, but is missing \"type\" attribute. Using AND.", name));
             }
-            return new ConditionDefinition(list, !"OR".equals(type), yes, no);
+            return new ConditionDefinition(list, !"OR".equals(type), yes.toString(), no.toString());
         }
     }
 }