From fe1507925c5144508bb3318d4ce73c2a618b9689 Mon Sep 17 00:00:00 2001
From: Ka0rX <guillaume.martinf@gmail.com>
Date: Wed, 19 Jul 2023 21:19:26 +0100
Subject: [PATCH] SQL & Yaml data loading/saving.

---
 .../manager/data/sql/MMOCoreDataSynchronizer.java        | 3 +++
 .../Indyuce/mmocore/manager/data/sql/SQLDataHandler.java | 3 +++
 .../mmocore/manager/data/yaml/YAMLPlayerDataHandler.java | 9 ++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/MMOCoreDataSynchronizer.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/MMOCoreDataSynchronizer.java
index e0154b61..c9f5b651 100644
--- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/MMOCoreDataSynchronizer.java
+++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/MMOCoreDataSynchronizer.java
@@ -94,6 +94,9 @@ public class MMOCoreDataSynchronizer extends SQLDataSynchronizer<PlayerData> {
             MMOCoreUtils.jsonArrayToList(result.getString("friends")).forEach(str -> getData().getFriends().add(UUID.fromString(str)));
         if (!isEmpty(result.getString("last_spawn_point")))
             getData().setLastSpawnPointContext(new SpawnPointContext(new JsonParser().parseString(result.getString("last_spawn_point")).getAsJsonObject()));
+        if (!isEmpty(result.getString("last_used_spawn_point")))
+            getData().setLastUsedSpawnPointContext(new SpawnPointContext(new JsonParser().parseString(result.getString("last_spawn_point")).getAsJsonObject()));
+
         getData().setShouldTeleportWhenJoin(result.getBoolean("should_teleport_when_join"));
         getData().setupSpawnPoint();
 
diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/SQLDataHandler.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/SQLDataHandler.java
index af7e12cf..49b29ec2 100644
--- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/SQLDataHandler.java
+++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/SQLDataHandler.java
@@ -34,6 +34,7 @@ public class SQLDataHandler extends SQLSynchronizedDataHandler<PlayerData, Offli
             "stamina", "FLOAT",
             "stellium", "FLOAT",
             "last_spawn_point", "LONGTEXT",
+            "last_used_spawn_point", "LONGTEXT",
             "spawn_when_join", "TINYINT"};
 
     @Override
@@ -68,6 +69,7 @@ public class SQLDataHandler extends SQLSynchronizedDataHandler<PlayerData, Offli
                 "unlocked_items LONGTEXT," +
                 "class_info LONGTEXT," +
                 "last_spawn_point LONGTEXT," +
+                "last_used_spawn_point LONGTEXT," +
                 "spawn_when_join TINYINT," +
                 "is_saved TINYINT," +
                 "PRIMARY KEY (uuid));");
@@ -125,6 +127,7 @@ public class SQLDataHandler extends SQLSynchronizedDataHandler<PlayerData, Offli
         updater.addData("quests", data.getQuestData().toJsonString());
         updater.addData("class_info", createClassInfoData(data).toString());
         updater.addData("last_spawn_point", data.getLastSpawnPointContext().toJson());
+        updater.addData("last_used_spawn_point", data.getLastUsedSpawnPointContext().toJson());
         updater.addJSONArray("unlocked_items", data.getUnlockedItems());
         if (!autosave)
             updater.addData("is_saved", 1);
diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataHandler.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataHandler.java
index 6327fdcb..17226eb6 100644
--- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataHandler.java
+++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataHandler.java
@@ -139,6 +139,10 @@ public class YAMLPlayerDataHandler extends YAMLSynchronizedDataHandler<PlayerDat
             data.setLastSpawnPointContext(new SpawnPointContext(config.getString("last-spawn-point.id"),
                     Optional.ofNullable(config.getString("last-spawn-point.server"))));
         }
+        if (config.contains("last-used-spawn-point")) {
+            data.setLastUsedSpawnPointContext(new SpawnPointContext(config.getString("last-used-spawn-point.id"),
+                    Optional.ofNullable(config.getString("last-used-spawn-point.server"))));
+        }
         data.setShouldTeleportWhenJoin(config.getBoolean("should-teleport-when-join", false));
         data.setupSpawnPoint();
         if (data.isOnline() && !data.getPlayer().isDead())
@@ -178,7 +182,10 @@ public class YAMLPlayerDataHandler extends YAMLSynchronizedDataHandler<PlayerDat
         config.set("attribute", null);
         config.createSection("attribute");
         data.getAttributes().save(config.getConfigurationSection("attribute"));
-
+        if (data.getLastSpawnPointContext() != null)
+            data.getLastUsedSpawnPointContext().save(config.createSection("last-used-spawn-point"));
+        if (data.getLastUsedSpawnPointContext() != null)
+            data.getLastUsedSpawnPointContext().save(config.createSection("last-used-spawn-point"));
         config.set("profession", null);
         config.createSection("profession");
         data.getCollectionSkills().save(config.getConfigurationSection("profession"));