From 9b7ebebf98ae0a7d906608b3cf665bc7191a3b33 Mon Sep 17 00:00:00 2001
From: EoD <293499+EoD@users.noreply.github.com>
Date: Thu, 10 Jul 2025 22:04:05 +0000
Subject: [PATCH] simplify and exit early in stringToGenericMap

(cherry picked from commit 53bdfe23097fc9b34ff4c43ea9b11100d90bbd09)
---
 .../fubuki/playersync/util/LocalJsonUtil.java | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/vip/fubuki/playersync/util/LocalJsonUtil.java b/src/main/java/vip/fubuki/playersync/util/LocalJsonUtil.java
index f583270..44c2249 100644
--- a/src/main/java/vip/fubuki/playersync/util/LocalJsonUtil.java
+++ b/src/main/java/vip/fubuki/playersync/util/LocalJsonUtil.java
@@ -7,11 +7,21 @@ import java.util.function.Function;
 public class LocalJsonUtil {
     private static <K> Map<K, String> stringToGenericMap(String param, Function<String, K> keyParser) {
         Map<K, String> map = new HashMap<>();
-        String s1 = param.substring(1,param.length()-1);
-        String s2 = s1.trim();
-        String[] split = s2.split(",");
-        for (int i = split.length - 1; i >= 0; i--) {
-            String trim = split[i].trim();
+
+        // check if string is at least minimal json
+        if (param == null || param.length() < 2 || param.equals("{}")) {
+            return map;
+        }
+
+        // extract string within outermost json brackets {}
+        String s1 = param.substring(param.indexOf('{')+1, param.lastIndexOf('}')).trim();
+        if (s1.isEmpty()) {
+            return map;
+        }
+
+        // split all json elements
+        for (String split : s1.split(",")) {
+            String trim = split.trim();
 
             // only check for the first "=" as the values also contain additional "="
             int equalIndex = trim.indexOf('=');