必要空きスロット指定メソッド追加

miyabi033 · miyabi033 · commit 0a794fe67866 · 2025-10-04T15:20:51.000+09:00
diff --git a/src/main/java/dev/felnull/pointed/Pointed.java b/src/main/java/dev/felnull/pointed/Pointed.java
@@ -7,6 +7,7 @@
 import dev.felnull.pointed.core.database.api.PointService;
 import dev.felnull.pointed.core.database.api.PointServiceImpl;
 import dev.felnull.pointed.core.listener.ChatListener;
+import dev.felnull.pointed.core.listener.RewardPendingAutoDeliverListener;
 import dev.felnull.pointed.core.util.ChatReader;
 import dev.felnull.pointed.teams.database.TeamTableInitializer;
 import dev.felnull.pointed.teams.manager.TeamManager;
@@ -80,6 +81,7 @@ public void setupCommand(){
     }
     public void setupListener(){
         Bukkit.getPluginManager().registerEvents(new ChatListener(this), this);
+        Bukkit.getPluginManager().registerEvents(new RewardPendingAutoDeliverListener(getRewardAdminService()), this);
     }
     public void setupPlugin(){
     }
diff --git a/src/main/java/dev/felnull/pointed/core/commands/RewardCommand.java b/src/main/java/dev/felnull/pointed/core/commands/RewardCommand.java
@@ -28,8 +28,13 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
         if (args.length == 1 && args[0].equalsIgnoreCase("claim")) {
             Bukkit.getScheduler().runTaskAsynchronously(Pointed.getInstance(), () -> {
                 try {
-                    int[] res = admin.claimPendingRewards(p.getUniqueId());
+                    // メインスレッドで claimPendingRewards を実行して結果を受け取る
+                    int[] res = Bukkit.getScheduler()
+                            .callSyncMethod(Pointed.getInstance(), () -> admin.claimPendingRewards(p.getUniqueId()))
+                            .get(); // ここは今の非同期スレッドで待つのでサーバはブロックしない
+
                     int delivered = res[0], remaining = res[1];
+                    // プレイヤーへのメッセージ送信はメインに戻す
                     Bukkit.getScheduler().runTask(Pointed.getInstance(), () -> {
                         if (delivered == 0 && remaining == 0) {
                             p.sendMessage(Util.f("&7受け取れる報酬はありません。"));
@@ -38,7 +43,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
                             if (remaining > 0) p.sendMessage(Util.f("&e空き不足で {0} 件保留です。", remaining));
                         }
                     });
-                } catch (SQLException e) {
+                } catch (Exception e) {
                     Bukkit.getScheduler().runTask(Pointed.getInstance(), () ->
                             p.sendMessage(Util.f("&cエラー: {0}", e.getMessage())));
                 }
diff --git a/src/main/java/dev/felnull/pointed/core/listener/RewardPendingAutoDeliverListener.java b/src/main/java/dev/felnull/pointed/core/listener/RewardPendingAutoDeliverListener.java
@@ -4,6 +4,7 @@
 import dev.felnull.pointed.core.util.Util;
 import dev.felnull.pointed.teams.manager.reward.RewardAdminService;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
@@ -20,21 +21,36 @@ public RewardPendingAutoDeliverListener(RewardAdminService admin) {
 
     @EventHandler
     public void onJoin(PlayerJoinEvent e) {
-        if(!(Pointed.getInstance().getConfig().getBoolean("reward", false))){
+        if (!Pointed.getInstance().getConfig().getBoolean("reward", false)) {
             return;
         }
         UUID uuid = e.getPlayer().getUniqueId();
+
+        // 非同期で起点 → メインで claim 実行 → 結果を受け取る
         Bukkit.getScheduler().runTaskAsynchronously(Pointed.getInstance(), () -> {
             try {
-                int[] res = admin.claimPendingRewards(uuid);
+                // ★ claimPendingRewards を必ずメインスレッドで実行
+                int[] res = Bukkit.getScheduler()
+                        .callSyncMethod(Pointed.getInstance(), () -> admin.claimPendingRewards(uuid))
+                        .get(); // 非同期側で待つのでサーバ主スレッドはここでは止まらない
+
                 int delivered = res[0], remaining = res[1];
+
                 if (delivered > 0 || remaining > 0) {
+                    // メッセージ送信もメインで
                     Bukkit.getScheduler().runTask(Pointed.getInstance(), () -> {
-                        if (delivered > 0) e.getPlayer().sendMessage(Util.f("&a{0}件の報酬を受け取りました。", delivered));
-                        if (remaining > 0) e.getPlayer().sendMessage(Util.f("&eインベントリの空きが足りません（保留 {0} 件）。空けて /reward claim を実行してください。", remaining));
+                        Player p = Bukkit.getPlayer(uuid);
+                        if (p == null || !p.isOnline()) return;
+
+                        if (delivered > 0) {
+                            p.sendMessage(Util.f("&a{0}件の報酬を受け取りました。", delivered));
+                        }
+                        if (remaining > 0) {
+                            p.sendMessage(Util.f("&eインベントリの空きが足りません（保留 {0} 件）。空けて /reward claim を実行してください。", remaining));
+                        }
                     });
                 }
-            } catch (SQLException ex) {
+            } catch (Exception ex) {
                 Bukkit.getLogger().warning("[Pointed] claim on login failed: " + ex.getMessage());
             }
         });
diff --git a/src/main/java/dev/felnull/pointed/teams/manager/reward/RewardAdminService.java b/src/main/java/dev/felnull/pointed/teams/manager/reward/RewardAdminService.java
@@ -26,6 +26,11 @@ public interface RewardAdminService {
     void setCommandEnabled(int rewardId, int idx, boolean enabled) throws SQLException;
     void updateCommandText(int rewardId, int idx, String newText) throws SQLException;
     boolean rewardExists(long rewardId);
+    /** rewards.required_slots を更新（0以上） */
+    void setRequiredSlots(int rewardId, int requiredSlots) throws SQLException;
+
+    /** rewards.required_slots を取得（null=存在しない） */
+    Integer getRequiredSlots(int rewardId) throws SQLException;
 
     // ===== Reward =====
     /**
diff --git a/src/main/java/dev/felnull/pointed/teams/manager/reward/impl/RewardAdminServiceImpl.java b/src/main/java/dev/felnull/pointed/teams/manager/reward/impl/RewardAdminServiceImpl.java
@@ -1026,4 +1026,29 @@ private Long findPlayerSubjectId(Connection c, String uuid) throws SQLException
         }
     }
 
+    @Override
+    public void setRequiredSlots(int rewardId, int requiredSlots) throws SQLException {
+        if (requiredSlots < 0) throw new SQLException("required_slots must be >= 0");
+        try (Connection c = ds.getConnection();
+             PreparedStatement ps = c.prepareStatement(
+                     "UPDATE " + Names.t("rewards") + " SET required_slots=? WHERE id=?")) {
+            ps.setInt(1, requiredSlots);
+            ps.setInt(2, rewardId);
+            int n = ps.executeUpdate();
+            if (n == 0) throw new SQLException("Reward not found: id=" + rewardId);
+        }
+    }
+
+    @Override
+    public Integer getRequiredSlots(int rewardId) throws SQLException {
+        try (Connection c = ds.getConnection();
+             PreparedStatement ps = c.prepareStatement(
+                     "SELECT required_slots FROM " + Names.t("rewards") + " WHERE id=?")) {
+            ps.setInt(1, rewardId);
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next() ? rs.getInt(1) : null;
+            }
+        }
+    }
+
 }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -13,6 +13,11 @@ commands:
     permission: pointed.admin
     description: Pointed commands
     usage: "/ptteam <>"
+  reward:
+    permission: pointed.player
+
 permissions:
   pointed.admin:
-    default: op
+    default: op
+  pointed.player:
+    default: true

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`import dev.felnull.pointed.core.database.api.PointService;`
`8`	`8`	`import dev.felnull.pointed.core.database.api.PointServiceImpl;`
`9`	`9`	`import dev.felnull.pointed.core.listener.ChatListener;`
	`10`	`+import dev.felnull.pointed.core.listener.RewardPendingAutoDeliverListener;`
`10`	`11`	`import dev.felnull.pointed.core.util.ChatReader;`
`11`	`12`	`import dev.felnull.pointed.teams.database.TeamTableInitializer;`
`12`	`13`	`import dev.felnull.pointed.teams.manager.TeamManager;`
`@@ -80,6 +81,7 @@ public void setupCommand(){`
`80`	`81`	`}`
`81`	`82`	`public void setupListener(){`
`82`	`83`	`Bukkit.getPluginManager().registerEvents(new ChatListener(this), this);`
	`84`	`+ Bukkit.getPluginManager().registerEvents(new RewardPendingAutoDeliverListener(getRewardAdminService()), this);`
`83`	`85`	`}`
`84`	`86`	`public void setupPlugin(){`
`85`	`87`	`}`