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

Don't crash when the player to drop can't be found.

Browse Source 
fixes #3224
This commit is contained in:
Matthias Mailänder
2013-06-17 19:42:56 +02:00
parent 734f12bbc6
commit b01d55f1f6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -496,7 +496,9 @@ namespace OpenRA.Server
{ {
conns.Remove(toDrop); conns.Remove(toDrop);
OpenRA.Network.Session.Client dropClient = lobbyInfo.Clients.Where(c1 => c1.Index == toDrop.PlayerIndex).Single(); var dropClient = lobbyInfo.Clients.Where(c1 => c1.Index == toDrop.PlayerIndex).FirstOrDefault();
if (dropClient == null)
return;
// Send disconnected order, even if still in the lobby // Send disconnected order, even if still in the lobby
SendMessage("{0} has disconnected.".F(dropClient.Name)); SendMessage("{0} has disconnected.".F(dropClient.Name));
@@ -511,7 +513,7 @@ namespace OpenRA.Server
// Remove any bots controlled by the admin // Remove any bots controlled by the admin
lobbyInfo.Clients.RemoveAll(c => c.Bot != null && c.BotControllerClientIndex == toDrop.PlayerIndex); lobbyInfo.Clients.RemoveAll(c => c.Bot != null && c.BotControllerClientIndex == toDrop.PlayerIndex);
OpenRA.Network.Session.Client nextAdmin = lobbyInfo.Clients.Where(c1 => c1.Bot == null) var nextAdmin = lobbyInfo.Clients.Where(c1 => c1.Bot == null)
.OrderBy(c => c.Index).FirstOrDefault(); .OrderBy(c => c.Index).FirstOrDefault();
if (nextAdmin != null) if (nextAdmin != null)