GroupDataのcloneも追加

Author: miyabi033

src/main/java/dev/felnull/Data/GroupData.java

@@ -93,4 +93,14 @@ public GroupData(@NotNull OfflinePlayer player, StorageData storageData, String
         }
         return result;
     }
+
+    public GroupData deepClone(StorageData storageData) {
+        // ここではdeepClone時に groupData は引数で渡される
+        Set<OfflinePlayer> clonedPlayerList = new HashSet<>(this.playerList);
+        Map<OfflinePlayer, String[]> clonedPlayerPermission = new HashMap<>(this.playerPermission);
+
+        return new GroupData(this.groupName, this.displayName, clonedPlayerList, clonedPlayerPermission, this.isPrivate, storageData, this.ownerPlugin, this.groupUUID);
+    }
+
+
 }

src/main/java/dev/felnull/Data/StorageData.java

@@ -78,7 +78,7 @@ public void updateInventoryData(String pageId) {
     public InventoryData getInventoryData(String pageId) {
         return storageInventory.get(pageId);
     }
-    public StorageData deepClone() {
+    public StorageData deepClone(GroupData groupData) {
         Map<String, InventoryData> clonedInventoryMap = new HashMap<>();
         for (Map.Entry<String, InventoryData> entry : this.storageInventory.entrySet()) {
             clonedInventoryMap.put(entry.getKey(), entry.getValue().deepClone());
@@ -91,6 +91,9 @@ public StorageData deepClone() {
         clone.groupUUID = this.groupUUID; // UUIDは共有で問題なし
         clone.fullyLoaded = this.fullyLoaded; // 同期状態も継承
 
+        // 引数で渡された groupData をそのまま代入
+        clone.groupData = groupData;
+
         return clone;
     }
 }

src/main/java/dev/felnull/DataIO/DataIO.java

@@ -467,8 +467,14 @@ private static StorageData loadStorageMetaOnly(Connection conn, UUID groupUUID)
 
         Map<String, InventoryData> invMap = loadInventoryMetaOnly(conn, groupUUID, pluginName);
         StorageData storageData = new StorageData(requireBankPerm, invMap, bankMoney);
-        storageData.groupData = GroupManager.getGroupByUUID(groupUUID);
+        storageData.groupData = loadGroupData(groupUUID);
         storageData.groupUUID = groupUUID;
+        if(storageData.groupData == null){
+            Bukkit.getLogger().warning("StorageMetaのGroupDataNull");
+        }else {
+            Bukkit.getLogger().warning("StorageMetaのGroupData有効!");
+        }
+
 
         storageData.setFullyLoaded(false);
         return storageData;