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

Merge pull request #11559 from MUzzell/feature-10416

Browse Source 
Added ready checkbox for spectating admins
This commit is contained in:
abcdefg30
2016-07-15 15:47:05 +02:00
committed by GitHub
parent 707a8e73da 6110357460
commit b1e8108a44
6 changed files with 80 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
View File

@@ -60,7 +60,8 @@ namespace OpenRA.Mods.Common.Server
static void CheckAutoStart(S server)
{
var playerClients = server.LobbyInfo.Clients.Where(c => c.Bot == null && c.Slot != null);
// A spectating admin is included for checking these rules
var playerClients = server.LobbyInfo.Clients.Where(c => (c.Bot == null && c.Slot != null) || c.IsAdmin);
// Are all players ready?
if (!playerClients.Any() || playerClients.Any(c => c.State != Session.ClientState.Ready))
@@ -188,6 +189,7 @@ namespace OpenRA.Mods.Common.Server
client.SpawnPoint = 0;
client.Color = HSLColor.FromRGB(255, 255, 255);
server.SyncLobbyClients();
CheckAutoStart(server);
return true;
}
else