修复

Author: MineSunshineone

src/main/java/ict/minesunshineone/peek/PeekPlugin.java

@@ -9,12 +9,14 @@
 import org.bukkit.plugin.java.JavaPlugin;
 
 import ict.minesunshineone.peek.command.PeekCommand;
+import ict.minesunshineone.peek.data.PeekData;
 import ict.minesunshineone.peek.handler.PeekStateHandler;
 import ict.minesunshineone.peek.handler.PeekTargetHandler;
 import ict.minesunshineone.peek.listener.PeekInteractionListener;
 import ict.minesunshineone.peek.listener.PeekListener;
 import ict.minesunshineone.peek.listener.PeekPacketListener;
 import ict.minesunshineone.peek.manager.CooldownManager;
+import java.util.UUID;
 import ict.minesunshineone.peek.manager.PrivacyManager;
 import ict.minesunshineone.peek.manager.StateManager;
 import ict.minesunshineone.peek.manager.StatisticsManager;
@@ -81,14 +83,35 @@ public void onEnable() {
     @Override
     public void onDisable() {
         if (stateHandler != null) {
-            new HashMap<>(stateHandler.getActivePeeks()).forEach((uuid, data) -> {
-                Player player = getServer().getPlayer(uuid);
-                if (player != null && player.isOnline()) {
-                    stateHandler.endPeek(player, true);
-                }
-            });
-            // 清理所有剩余资源（BossBar、距离检查器等）
+            // 先取消所有定时任务（RangeChecker、BossBar等）
             stateHandler.cleanup();
+
+            // 同步恢复所有观察中的玩家状态
+            // 服务器关闭时不能依赖异步任务完成
+            for (Map.Entry<UUID, PeekData> entry : new HashMap<>(stateHandler.getActivePeeks()).entrySet()) {
+                Player player = getServer().getPlayer(entry.getKey());
+                PeekData data = entry.getValue();
+                if (player == null || !player.isOnline()) {
+                    continue;
+                }
+
+                // 记录统计
+                long duration = (System.currentTimeMillis() - data.getStartTime()) / 1000;
+                statisticsManager.recordPeekEnd(player, duration);
+
+                if (!player.isDead()) {
+                    try {
+                        ict.minesunshineone.peek.util.PlayerStateUtil.forceExitRidingState(player);
+                        player.teleport(data.getOriginalLocation());
+                        stateHandler.getStateRestorer().applyRestoredState(player, data);
+                    } catch (Exception e) {
+                        getLogger().warning(String.format("关服时无法恢复玩家 %s 的状态，将在重连时恢复: %s",
+                                player.getName(), e.getMessage()));
+                        // 状态文件保留在磁盘上，下次登录时 onPlayerJoin 自动恢复
+                    }
+                }
+                // 死亡玩家的状态文件保留，下次登录时自动恢复
+            }
         }
 
         if (statisticsManager != null) {

src/main/java/ict/minesunshineone/peek/handler/PeekStateHandler.java

@@ -214,10 +214,6 @@ public void endPeek(Player peeker, boolean shouldRestore) {
                 }
             }
 
-            if (shouldRestore && !peeker.isDead()) {
-                plugin.getStateManager().clearPlayerState(peeker);
-            }
-
             // 发送消息
             if (peeker.isOnline()) {
                 plugin.getMessages().send(peeker, "peek-end");
@@ -274,6 +270,10 @@ private void teleportAndSetGameMode(Player peeker, Player target) {
                             startNormalRangeChecker(peeker, target);
                         }, () -> logDebug("Peeker %s went offline after teleport", peeker.getName()));
                     }
+                }).exceptionally(ex -> {
+                    plugin.getLogger().warning(String.format("传送玩家 %s 时发生异常: %s", peeker.getName(), ex.getMessage()));
+                    onFailed.run();
+                    return null;
                 });
             }, onFailed, 2L); // 2 tick 延迟
 
@@ -373,7 +373,6 @@ private void startRespawnWatcher(Player peeker, PeekData data) {
                     if (!peeker.isDead()) {
                         task.cancel();
                         stateRestorer.restorePlayerState(peeker, data);
-                        plugin.getStateManager().clearPlayerState(peeker);
                         plugin.getMessages().send(peeker, "peek-end-respawn");
                     }
                 },

src/main/java/ict/minesunshineone/peek/handler/PlayerStateRestorer.java

@@ -51,6 +51,10 @@ public void restorePlayerState(Player peeker, PeekData data) {
                 } else {
                     onFailed.run();
                 }
+            }).exceptionally(ex -> {
+                plugin.getLogger().warning(String.format("恢复玩家 %s 传送时发生异常: %s", peeker.getName(), ex.getMessage()));
+                onFailed.run();
+                return null;
             });
         }, onFailed, 1L);
 
@@ -91,6 +95,10 @@ public void handleTeleportFailure(Player peeker, PeekData data) {
                     } else {
                         onFailed.run();
                     }
+                }).exceptionally(ex -> {
+                    plugin.getLogger().warning(String.format("传送玩家 %s 到重生点时发生异常: %s", peeker.getName(), ex.getMessage()));
+                    onFailed.run();
+                    return null;
                 });
             }, onFailed, 1L);
 
@@ -163,6 +171,9 @@ public void applyRestoredState(Player peeker, PeekData data) {
         // 清除现有效果并应用保存的效果
         peeker.getActivePotionEffects().forEach(effect -> peeker.removePotionEffect(effect.getType()));
         data.getPotionEffects().forEach(effect -> peeker.addPotionEffect(effect));
+
+        // 游戏模式已恢复，现在安全地清除状态文件
+        plugin.getStateManager().clearPlayerState(peeker);
     }
 
     /**

src/main/java/ict/minesunshineone/peek/listener/PeekListener.java

@@ -70,9 +70,8 @@ public void onPlayerJoin(PlayerJoinEvent event) {
                     task -> {
                         if (!player.isDead()) {
                             task.cancel();
-                            // 直接恢复状态
+                            // 直接恢复状态（clearPlayerState 在 applyRestoredState 中执行）
                             plugin.getStateHandler().getStateRestorer().restorePlayerState(player, savedState);
-                            plugin.getStateManager().clearPlayerState(player);
                             // 发送断线重连提示
                             plugin.getMessages().send(player, "peek-end-offline");
                         }