バグ修正

miyabi033 · miyabi033 · commit e080f3dcda23 · 2025-06-23T23:58:26.000+09:00
diff --git a/src/main/java/dev/felnull/BetterStorage.java b/src/main/java/dev/felnull/BetterStorage.java
@@ -4,6 +4,8 @@
 import dev.felnull.DataIO.TableInitializer;
 import dev.felnull.Listeners.CommonListener;
 import dev.felnull.commands.BetterStorageCommand;
+import dev.felnull.commands.CheckDBCommand;
+import dev.felnull.commands.RawSQLCommand;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -24,10 +26,10 @@ public void onEnable() {
             e.printStackTrace();
         }
         initEventListeners();
-        initCommands();
-        dbManager = new DatabaseManager();
         saveDefaultConfig();
+        dbManager = new DatabaseManager();
         LogCleanerScheduler.schedule(dbManager);
+        initCommands();
         //ロガーの起動
         //Vault呼び出し
         //CSDirectorをnewで呼び出してメインクラスのpublic変数に置く
@@ -41,6 +43,9 @@ private void initEventListeners() {
     private void initCommands() {
         getCommand("bstorage").setExecutor(new BetterStorageCommand());
         getCommand("bstorage").setTabCompleter(new BetterStorageCommand());
+        getCommand("bscheckdb").setExecutor(new CheckDBCommand(dbManager));
+        getCommand("bsrawsql").setExecutor(new RawSQLCommand(dbManager));
+
     }
 
 
diff --git a/src/main/java/dev/felnull/DataIO/DataIO.java b/src/main/java/dev/felnull/DataIO/DataIO.java
@@ -27,6 +27,9 @@ public class DataIO {
 
     /** グループ全体を保存（各テーブルへの分割保存） */
     public static boolean saveGroupData(GroupData g, long clientVersion) {
+
+        Bukkit.getLogger().info("[DEBUG] 保存対象 groupUUID: " + g.groupUUID);
+        Bukkit.getLogger().info("[DEBUG] 保存対象 groupName: " + g.groupName);
         try (Connection conn = db.getConnection()) {
             // 最新version取得
             String selectSql = "SELECT version FROM group_table WHERE group_uuid = ?";
@@ -40,6 +43,7 @@ public static boolean saveGroupData(GroupData g, long clientVersion) {
 
             // バージョン不一致なら競合
             if (dbVersion != clientVersion) {
+                Bukkit.getLogger().info("V不一致");
                 return false;
             }
 
@@ -69,6 +73,7 @@ public static boolean saveGroupData(GroupData g, long clientVersion) {
 
             // 成功したので差分ログを保存
             DiffLogManager.saveDiffLogs(BetterStorage.BSPlugin.getDatabaseManager(), g);
+            Bukkit.getLogger().info("保存成功らしい");
             return true;
         } catch (SQLException e) {
             Bukkit.getLogger().warning("GroupDataの保存に失敗: " + e.getMessage());
@@ -171,15 +176,23 @@ private static void saveStorageData(Connection conn, GroupData g) throws SQLExce
         }
     }
 
-    public static boolean saveInventoryOnly(GroupData g, String pageId) {
+    public static boolean saveInventoryOnly(GroupData g, StorageData storageData, String pageId) {
         try (Connection conn = db.getConnection()) {
-            InventoryData inv = g.storageData.storageInventory.get(pageId);
-            if (inv == null) return false;
+            InventoryData inv = storageData.storageInventory.get(pageId);
+            storageData.groupUUID = g.groupUUID;
+            g.storageData = storageData;
+            if (inv == null) {
+                return false;
+            }
 
-            if (!inv.isFullyLoaded()) return false;
+            if (!inv.isFullyLoaded()) {
+                g.storageData.loadPage(conn, g.ownerPlugin, pageId);
+            }
 
             long dbVersion = getGroupVersion(conn, g.groupUUID);
-            if (dbVersion != g.version) return false;
+            if (dbVersion != g.version) {
+                return false;
+            }
             g.version = dbVersion + 1;
 
             saveSinglePage(conn, g, pageId, inv);
@@ -345,22 +358,37 @@ private static StorageData loadStorageMetaOnly(Connection conn, UUID groupUUID)
         try (PreparedStatement ps = conn.prepareStatement(
                 "SELECT plugin_name, bank_money, require_bank_permission FROM storage_table WHERE group_uuid = ?")) {
             ps.setString(1, groupUUID.toString());
+
+            Bukkit.getLogger().info("[Debug] Executing query for group_uuid = " + groupUUID);
+
             try (ResultSet rs = ps.executeQuery()) {
-                if (!rs.next()) return null;
+                if (!rs.next()){
+                    Bukkit.getLogger().warning("[Debug] No result found for group_uuid = " + groupUUID);
+                    return null;
+                }
                 pluginName = rs.getString("plugin_name");
                 bankMoney = rs.getDouble("bank_money");
+                String requireBankPermRaw = rs.getString("require_bank_permission");
                 requireBankPerm = gson.fromJson(rs.getString("require_bank_permission"), new TypeToken<Set<String>>() {}.getType());
+
+                Bukkit.getLogger().info("[Debug] Loaded: plugin=" + pluginName + ", bank=" + bankMoney + ", perms=" + requireBankPermRaw);
             }
         }
 
         Map<String, InventoryData> invMap = loadInventoryMetaOnly(conn, groupUUID, pluginName);
+        if (invMap == null) {
+            Bukkit.getLogger().warning("[Debug] Inventory meta load failed for groupUUID = " + groupUUID);
+            return null;
+        }
         StorageData storageData = new StorageData(requireBankPerm, invMap, bankMoney);
+        storageData.groupData = GroupManager.getGroupByUUID(groupUUID);
         storageData.setFullyLoaded(false);
         return storageData;
     }
     //外部呼出し用
     public static StorageData loadStorageMetaOnly(UUID groupUUID) {
         try (Connection conn = db.getConnection()) {
+            Bukkit.getLogger().info("[Debug] loadStorageMetaOnly: groupUUID = " + groupUUID);
             return loadStorageMetaOnly(conn, groupUUID);
         } catch (SQLException e) {
             Bukkit.getLogger().warning("StorageMetaの読み込みに失敗: " + e.getMessage());
@@ -403,10 +431,11 @@ private static Map<String, InventoryData> loadInventoryMetaOnly(Connection conn,
     //外部呼出し用
     public static Map<String, InventoryData> loadInventoryMetaOnly(UUID groupUUID, String pluginName) {
         try (Connection conn = db.getConnection()) {
-            return loadInventoryMetaOnly(conn, groupUUID, pluginName);
+            Map<String, InventoryData> result = loadInventoryMetaOnly(conn, groupUUID, pluginName);
+            return result.isEmpty() ? null : result;
         } catch (SQLException e) {
             Bukkit.getLogger().warning("InventoryMetaの読み込みに失敗: " + e.getMessage());
-            return Collections.emptyMap();
+            return null;
         }
     }
 
diff --git a/src/main/java/dev/felnull/DataIO/GroupManager.java b/src/main/java/dev/felnull/DataIO/GroupManager.java
@@ -96,8 +96,9 @@ public static List<String> getAllGroupNames() {
     /**個人向けグループデータを取得**/
     public static @Nullable GroupData getPersonalGroup(UUID playerUUID) {
         return getAllGroups().stream()
-                .filter(g -> g.isPrivate && g.groupUUID.equals(playerUUID))
+                .filter(g -> g.isPrivate && g.groupName.equals(playerUUID.toString()))
                 .findFirst()
                 .orElse(null);
     }
+
 }
diff --git a/src/main/java/dev/felnull/DataIO/TableInitializer.java b/src/main/java/dev/felnull/DataIO/TableInitializer.java
@@ -2,10 +2,10 @@
 
 import dev.felnull.BetterStorage;
 import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.FileConfiguration;
 
 import java.sql.*;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.*;
 import java.util.logging.Logger;
 
 public class TableInitializer {
@@ -154,4 +154,6 @@ private static String getTableNameFromIndex(String indexName) {
         if (indexName.contains("inventory")) return "inventory_table";
         return "";
     }
+
+
 }
diff --git a/src/main/java/dev/felnull/commands/CheckDBCommand.java b/src/main/java/dev/felnull/commands/CheckDBCommand.java
@@ -0,0 +1,55 @@
+package dev.felnull.commands;
+
+import dev.felnull.DataIO.DatabaseManager;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CheckDBCommand implements CommandExecutor {
+
+    private final DatabaseManager db;
+
+    public CheckDBCommand(DatabaseManager db) {
+        this.db = db;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        sender.sendMessage("§e[BetterStorage] DB整合性チェックを開始しますにゃ…");
+
+        try (Connection conn = db.getConnection()) {
+            // storage_table に存在する group_uuid で、group_table に存在しないものを探す
+            String sql = "SELECT s.group_uuid FROM storage_table s LEFT JOIN group_table g ON s.group_uuid = g.group_uuid WHERE g.group_uuid IS NULL";
+            try (PreparedStatement ps = conn.prepareStatement(sql);
+                 ResultSet rs = ps.executeQuery()) {
+
+                List<String> brokenUUIDs = new ArrayList<>();
+                while (rs.next()) {
+                    brokenUUIDs.add(rs.getString("group_uuid"));
+                }
+
+                if (brokenUUIDs.isEmpty()) {
+                    sender.sendMessage("§a整合性チェック完了：異常なしにゃ！");
+                } else {
+                    sender.sendMessage("§c破損データを検出！以下の group_uuid に対応するグループが存在しないにゃ：");
+                    for (String uuid : brokenUUIDs) {
+                        sender.sendMessage(" - §e" + uuid);
+                    }
+                }
+
+            }
+        } catch (SQLException e) {
+            sender.sendMessage("§cエラーが発生したにゃ：" + e.getMessage());
+            e.printStackTrace();
+        }
+
+        return true;
+    }
+}
diff --git a/src/main/java/dev/felnull/commands/RawSQLCommand.java b/src/main/java/dev/felnull/commands/RawSQLCommand.java
@@ -0,0 +1,72 @@
+package dev.felnull.commands;
+
+import dev.felnull.DataIO.DatabaseManager;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import java.sql.*;
+
+public class RawSQLCommand implements CommandExecutor {
+    private final DatabaseManager db;
+
+    public RawSQLCommand(DatabaseManager db) {
+        this.db = db;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+
+        if (args.length == 0) {
+            sender.sendMessage(ChatColor.RED + "SQL文を指定してください！");
+            return false;
+        }
+
+        String sql = String.join(" ", args);
+
+        try (Connection conn = db.getConnection(); Statement stmt = conn.createStatement()) {
+
+            String lowerSQL = sql.trim().toLowerCase();
+
+            if (lowerSQL.startsWith("select") || lowerSQL.startsWith("show") || lowerSQL.startsWith("desc")) {
+                try (ResultSet rs = stmt.executeQuery(sql)) {
+                    ResultSetMetaData meta = rs.getMetaData();
+                    int columnCount = meta.getColumnCount();
+
+                    // ヘッダ行
+                    StringBuilder header = new StringBuilder(ChatColor.YELLOW + "[結果]");
+                    for (int i = 1; i <= columnCount; i++) {
+                        header.append(" | ").append(meta.getColumnLabel(i));
+                    }
+                    sender.sendMessage(header.toString());
+
+                    // データ行
+                    int rowCount = 0;
+                    while (rs.next() && rowCount < 10) { // 上限10行まで表示（多すぎ防止）
+                        StringBuilder row = new StringBuilder();
+                        for (int i = 1; i <= columnCount; i++) {
+                            row.append(" | ").append(rs.getString(i));
+                        }
+                        sender.sendMessage(row.toString());
+                        rowCount++;
+                    }
+
+                    if (rs.next()) {
+                        sender.sendMessage(ChatColor.GRAY + "...さらに結果があります（10行のみ表示）");
+                    }
+
+                }
+            } else {
+                int rows = stmt.executeUpdate(sql);
+                sender.sendMessage(ChatColor.GREEN + "SQL実行成功にゃ！影響行数: " + rows);
+            }
+
+        } catch (SQLException e) {
+            sender.sendMessage(ChatColor.RED + "SQL実行エラー: " + e.getMessage());
+            e.printStackTrace();
+        }
+
+        return true;
+    }
+}
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -10,6 +10,14 @@ commands:
     usage: /<command> rollback|list|diff|help
     permission: betterstorage.command
     permission-message: 権限がありませんにゃ。
+  bscheckdb:
+    description: DB整合性を確認するにゃ
+    usage: /bscheckdb
+    permission: betterstorage.command
+  bsrawsql:
+    description: 任意SQLを実行する開発者用コマンド
+    usage: /bsrawsql <SQL文>
+    permission: betterstorage.command
 permissions:
   betterstorage.command:
     description: BetterStorageコマンドの使用を許可するにゃ。

Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,9 @@ public static List<String> getAllGroupNames() {`
`96`	`96`	`/個人向けグループデータを取得/`
`97`	`97`	`public static @Nullable GroupData getPersonalGroup(UUID playerUUID) {`
`98`	`98`	`return getAllGroups().stream()`
`99`		`- .filter(g -> g.isPrivate && g.groupUUID.equals(playerUUID))`
	`99`	`+ .filter(g -> g.isPrivate && g.groupName.equals(playerUUID.toString()))`
`100`	`100`	`.findFirst()`
`101`	`101`	`.orElse(null);`
`102`	`102`	`}`
	`103`	`+`
`103`	`104`	`}`