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

Fixes #3336.

Browse Source
This commit is contained in:
Paul Chote
2013-06-26 21:42:56 +12:00
parent fc6a38182d
commit 6e4cf37e44
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs
View File

@@ -55,12 +55,17 @@ namespace OpenRA.Mods.RA.Server
void CheckAutoStart(S server, Connection conn, Session.Client client) void CheckAutoStart(S server, Connection conn, Session.Client client)
{ {
var actualPlayers = server.conns var playerClients = server.lobbyInfo.Clients.Where(c => c.Bot == null && c.Slot != null);
.Select(c => server.GetClient(c))
.Where(c => c.Slot != null);
if (actualPlayers.Count() > 0 && actualPlayers.All(c => c.State == Session.ClientState.Ready)) // Are all players ready?
InterpretCommand(server, conn, client, "startgame"); if (playerClients.Count() == 0 || playerClients.Any(c => c.State != Session.ClientState.Ready))
return;
// Are the map conditions satisfied?
if (server.lobbyInfo.Slots.Any(sl => sl.Value.Required && server.lobbyInfo.ClientInSlot(sl.Key) == null))
return;
server.StartGame();
} }
public bool InterpretCommand(S server, Connection conn, Session.Client client, string cmd) public bool InterpretCommand(S server, Connection conn, Session.Client client, string cmd)