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

Fix "game is full" error when the game is not full.

Browse Source 
Client.IsObserver is not valid to check until the
slot has been assigned.
This commit is contained in:
Paul Chote
2018-12-22 14:40:13 +13:00
committed by Oliver Brakmann
parent e71a31925f
commit d823d38e8c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -334,13 +334,6 @@ namespace OpenRA.Server
IsAdmin = !LobbyInfo.Clients.Any(c1 => c1.IsAdmin) IsAdmin = !LobbyInfo.Clients.Any(c1 => c1.IsAdmin)
}; };
if (client.IsObserver && !LobbyInfo.GlobalSettings.AllowSpectators)
{
SendOrderTo(newConn, "ServerError", "The game is full");
DropClient(newConn);
return;
}
if (ModData.Manifest.Id != handshake.Mod) if (ModData.Manifest.Id != handshake.Mod)
{ {
Log.Write("server", "Rejected connection from {0}; mods do not match.", Log.Write("server", "Rejected connection from {0}; mods do not match.",
@@ -375,6 +368,13 @@ namespace OpenRA.Server
{ {
client.Slot = LobbyInfo.FirstEmptySlot(); client.Slot = LobbyInfo.FirstEmptySlot();
if (client.IsObserver && !LobbyInfo.GlobalSettings.AllowSpectators)
{
SendOrderTo(newConn, "ServerError", "The game is full");
DropClient(newConn);
return;
}
if (client.Slot != null) if (client.Slot != null)
SyncClientToPlayerReference(client, Map.Players.Players[client.Slot]); SyncClientToPlayerReference(client, Map.Players.Players[client.Slot]);
else else