epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2998 from Mailaender/lobby-crash

Browse Source 
Don't crash when host leaves the lobby, fixes #2980
This commit is contained in:
Chris Forbes
2013-04-07 13:14:53 -07:00
parent 3272b6725e 6b164672eb
commit a694d10d2f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Server/Server.cs
View File

@@ -517,13 +517,14 @@ namespace OpenRA.Server
SendDisconnected(toDrop); /* Report disconnection */
lobbyInfo.Clients.RemoveAll(c => c.Index == toDrop.PlayerIndex);
// remove the bots he added
lobbyInfo.Clients.RemoveAll(c => c.BotControllerClientIndex == toDrop.PlayerIndex);
// reassign admin if necessary
if (lobbyInfo.GlobalSettings.Dedicated && dropClient.IsAdmin && State == ServerState.WaitingPlayers)
{
if (lobbyInfo.Clients.Where(c1 => c1.Bot == null).Count() > 0)
// clean up the bots that were added by the last admin
lobbyInfo.Clients.RemoveAll(c => c.Bot != null && c.BotControllerClientIndex == toDrop.PlayerIndex);
if (lobbyInfo.Clients.Any(c1 => c1.Bot == null))
{
// client was not alone on the server but he was admin: set admin to the last connected client
OpenRA.Network.Session.Client lastClient = lobbyInfo.Clients.Where(c1 => c1.Bot == null).Last();