Fix UnsupportedOperationException in SqlUserLoader

Archy-X · Jul 28, 2024 · abe0ff0 · abe0ff0
1 parent cc6af2c
commit abe0ff0
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/common/src/main/java/dev/aurelium/auraskills/common/storage/sql/SqlUserLoader.java b/common/src/main/java/dev/aurelium/auraskills/common/storage/sql/SqlUserLoader.java
@@ -95,7 +95,7 @@ private void processResultSet(ResultSet rs, User user) throws SQLException {
             for (JsonElement skillLevelElement : skillLevels) {
                 JsonObject skillLevelObj = skillLevelElement.getAsJsonObject();
 
-                String name = skillLevelObj.get("name").getAsString();
+                String name = getString(skillLevelObj, "name");
                 int level = skillLevelObj.get("level").getAsInt();
                 double xp = skillLevelObj.get("xp").getAsDouble();
 
@@ -109,14 +109,14 @@ private void processResultSet(ResultSet rs, User user) throws SQLException {
 
         // Load key values
         JsonArray keyValues = getJsonArray("key_values", rs);
-        if (keyValues != null) {
+        if (keyValues != null && !keyValues.isJsonNull()) {
             for (JsonElement keyValueElement : keyValues) {
                 JsonObject keyValueObj = keyValueElement.getAsJsonObject();
 
                 int dataId = keyValueObj.get("data_id").getAsInt();
-                String categoryId = keyValueObj.get("category_id").getAsString();
-                String keyName = keyValueObj.get("key_name").getAsString();
-                String value = keyValueObj.get("value").getAsString();
+                String categoryId = getString(keyValueObj, "category_id");
+                String keyName = getString(keyValueObj, "key_name");
+                String value = getString(keyValueObj, "value");
 
                 switch (dataId) {
                     case STAT_MODIFIER_ID -> applyStatModifier(user, categoryId, keyName, value);
@@ -133,6 +133,14 @@ private void processResultSet(ResultSet rs, User user) throws SQLException {
         user.clearInvalidItems();
     }
 
+    private String getString(JsonObject parent, String key) {
+        JsonElement element = parent.get(key);
+        if (element != null && !element.isJsonNull() && element.isJsonPrimitive()) {
+            return element.getAsString();
+        }
+        return "";
+    }
+
     private void applyStatModifier(User user, String categoryId, String keyName, String valueStr) {
         try {
             double valueDouble = Double.parseDouble(valueStr);