From 446c9d71fec251a5182fcf85fa2f06271faac460 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Sun, 3 Nov 2024 14:31:39 +0800 Subject: [PATCH] fix some storage issues --- .../bukkit/storage/method/database/nosql/RedisManager.java | 4 +++- .../bukkit/storage/method/file/JsonProvider.java | 1 + .../bukkit/storage/method/file/YAMLProvider.java | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/database/nosql/RedisManager.java b/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/database/nosql/RedisManager.java index 488d96f8..d16da354 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/database/nosql/RedisManager.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/database/nosql/RedisManager.java @@ -287,7 +287,9 @@ public class RedisManager extends AbstractStorage { byte[] data = jedis.get(key); jedis.del(key); if (data != null) { - future.complete(Optional.of(plugin.getStorageManager().fromBytes(data))); + PlayerData playerData = plugin.getStorageManager().fromBytes(data); + playerData.uuid(uuid); + future.complete(Optional.of(playerData)); } else { future.complete(Optional.empty()); } diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/file/JsonProvider.java b/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/file/JsonProvider.java index 8ab5e109..d0b502e4 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/file/JsonProvider.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/file/JsonProvider.java @@ -59,6 +59,7 @@ public class JsonProvider extends AbstractStorage { PlayerData playerData; if (file.exists()) { playerData = readFromJsonFile(file, PlayerData.class); + playerData.uuid(uuid); } else if (Bukkit.getPlayer(uuid) != null) { playerData = PlayerData.empty(); playerData.uuid(uuid); diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/file/YAMLProvider.java b/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/file/YAMLProvider.java index b345acb4..5057e433 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/file/YAMLProvider.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/storage/method/file/YAMLProvider.java @@ -74,6 +74,7 @@ public class YAMLProvider extends AbstractStorage { } YamlDocument data = plugin.getConfigManager().loadData(dataFile); PlayerData playerData = PlayerData.builder() + .uuid(uuid) .bag(new InventoryData(data.getString("bag", ""), data.getInt("size", 9))) .earnings(new EarningData(data.getDouble("earnings"), data.getInt("date"))) .statistics(getStatistics(data.getSection("stats")))