fix: 修复 Lobby TCP API 与当前连接状态绑定失效问题

Author: jmctsh

OpenRA.Game/Game.cs

@@ -118,6 +118,8 @@ public static OrderManager JoinServer(ConnectionTarget endpoint, string password
 				LobbyServer = new LobbyCommandServer(7446, OrderManager);
 				LobbyServer.Start();
 			}
+			else
+				LobbyServer.UpdateOrderManager(OrderManager);
 
 			return om;
 		}

OpenRA.Game/LobbyCommandServer.cs

@@ -15,7 +15,7 @@ public class LobbyCommandServer
 	{
 		Socket serverSocket;
 		readonly int port;
-		readonly OrderManager orderManager;
+		OrderManager orderManager;
 		bool isRunning;
 		public const string CurrentApiVersion = "1.0";
 
@@ -82,6 +82,11 @@ public LobbyCommandServer(int port, OrderManager orderManager)
 			this.orderManager = orderManager;
 		}
 
+		public void UpdateOrderManager(OrderManager orderManager)
+		{
+			this.orderManager = orderManager;
+		}
+
 		~LobbyCommandServer()
 		{
 			End();
@@ -291,11 +296,22 @@ async Task HandleClient(Socket clientSocket)
 					if (request.Params == null)
 						request.Params = new JObject();
 
+					var currentOrderManager = orderManager;
+					if (currentOrderManager == null)
+					{
+						SendErrorResponse(clientSocket, new MCPError
+						{
+							Code = MCPErrorCodes.InternalError,
+							Message = GetErrorMessage("INTERNAL_ERROR", language)
+						}, request.RequestId, DebugMode);
+						return;
+					}
+
 					if (CommandHandlers.TryGetValue(request.Command, out var commandHandler))
 					{
 						try
 						{
-							var result = commandHandler?.Invoke(request.Params, orderManager);
+							var result = commandHandler?.Invoke(request.Params, currentOrderManager);
 							SendSuccessResponse(clientSocket, result, request.RequestId, null, DebugMode);
 						}
 						catch (Exception ex)
@@ -319,7 +335,7 @@ async Task HandleClient(Socket clientSocket)
 					{
 						try
 						{
-							var resultJson = queryHandler?.Invoke(request.Params, orderManager);
+							var resultJson = queryHandler?.Invoke(request.Params, currentOrderManager);
 							SendSuccessResponse(clientSocket, null, request.RequestId, resultJson, DebugMode);
 						}
 						catch (Exception ex)

OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyCommands.cs

@@ -58,7 +58,7 @@ public static string SetSpawn(JObject json, OrderManager orderManager)
 
 		public static string SetSpectator(JObject json, OrderManager orderManager)
 		{
-			orderManager.IssueOrder(Order.Command("spectator"));
+			orderManager.IssueOrder(Order.Command("spectate"));
 			return "Spectator set order issued";
 		}
 

OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs

@@ -168,12 +168,14 @@ internal LobbyLogic(Widget widget, ModData modData, WorldRenderer worldRenderer,
 			if (Game.LobbyServer == null)
 			{
 				lobbyServer = new LobbyCommandServer(7446, orderManager);
+				Game.LobbyServer = lobbyServer;
 				LobbyCommands.Register(lobbyServer);
 				lobbyServer.Start();
 			}
 			else
 			{
 				lobbyServer = Game.LobbyServer;
+				lobbyServer.UpdateOrderManager(orderManager);
 				LobbyCommands.Register(lobbyServer);
 			}
 
@@ -584,7 +586,6 @@ protected override void Dispose(bool disposing)
 			if (disposing && !disposed)
 			{
 				disposed = true;
-				lobbyServer?.End();
 				Game.LobbyInfoChanged -= UpdateCurrentMap;
 				Game.LobbyInfoChanged -= UpdatePlayerList;
 				Game.LobbyInfoChanged -= UpdateDiscordStatus;