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

ignore spectators for readiness check

Browse Source
This commit is contained in:
Chris Forbes
2012-09-04 11:24:59 +12:00
parent 3d8dc80f03
commit fb58840cea
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,6 +53,16 @@ namespace OpenRA.Mods.RA.Server
return true; return true;
} }
void CheckAutoStart(S server, Connection conn, Session.Client client)
{
var actualPlayers = server.conns
.Select(c => server.GetClient(c))
.Where(c => c.Slot != null);
if (actualPlayers.Count() > 0 && actualPlayers.All(c => c.State == Session.ClientState.Ready))
InterpretCommand(server, conn, client, "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)
{ {
if (!ValidateCommand(server, conn, client, cmd)) if (!ValidateCommand(server, conn, client, cmd))
@@ -74,8 +84,7 @@ namespace OpenRA.Mods.RA.Server
server.SyncLobbyInfo(); server.SyncLobbyInfo();
if (server.conns.Count > 0 && server.conns.All(c => server.GetClient(c).State == Session.ClientState.Ready)) CheckAutoStart(server, conn, client);
InterpretCommand(server, conn, client, "startgame");
return true; return true;
}}, }},
@@ -114,6 +123,8 @@ namespace OpenRA.Mods.RA.Server
S.SyncClientToPlayerReference(client, server.Map.Players[s]); S.SyncClientToPlayerReference(client, server.Map.Players[s]);
server.SyncLobbyInfo(); server.SyncLobbyInfo();
CheckAutoStart(server, conn, client);
return true; return true;
}}, }},
{ "spectate", { "spectate",