From dda674af58f501f76b9774c0a74569e27c9b4c85 Mon Sep 17 00:00:00 2001
From: zhouwei <849588297@qq.com>
Date: Mon, 26 Jan 2026 17:23:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E6=88=BF=E9=97=B4=EF=BC=8C=E6=81=A2=E5=A4=8D=E5=8F=AF=E7=94=A8?=
 =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/group/robot/matcher/RoomWanfaMatcher.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/game_web/robot_mgr/src/main/java/com/group/robot/matcher/RoomWanfaMatcher.java b/game_web/robot_mgr/src/main/java/com/group/robot/matcher/RoomWanfaMatcher.java
index 5649356..b5dc82b 100644
--- a/game_web/robot_mgr/src/main/java/com/group/robot/matcher/RoomWanfaMatcher.java
+++ b/game_web/robot_mgr/src/main/java/com/group/robot/matcher/RoomWanfaMatcher.java
@@ -171,8 +171,9 @@ public class RoomWanfaMatcher {
         //检查调度器是否可用
         if (!scheduler.isShutdown()) {
             CompletableFuture.runAsync(() -> {
+                RobotInfo robot = null;
                 try {
-                    RobotInfo robot = robotManager.getLoggedInRobotForWanfa(wanfaId);
+                    robot = robotManager.getLoggedInRobotForWanfa(wanfaId);
                     //加入房间
                     GroupRoomBusiness.joinRoom(group, roomId, robot.getSession(), null);
 
@@ -185,6 +186,9 @@ public class RoomWanfaMatcher {
                         robotConnectionHandler.readyTimeRobotExit(robot);
                     }
                 } catch (Exception e) {
+                    if (robot != null) {
+                        robotConnectionHandler.disconnectRobot(robot.getRobotId());
+                    }
                     log.error("机器人加入房间时发生错误: groupId={}, roomId={}, wanfaId={}, isRobot={}", group, roomId, wanfaId, isRobot, e);
                 }
             });