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

Merge pull request #6577 from pchote/fix-validation

Browse Source 
Don’t die when connecting to a full server.
This commit is contained in:
obrakmann
2014-09-27 13:23:45 +02:00
parent ffeff5c7b6 7042004af3
commit be44b20797
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/ServerTraits/ColorValidator.cs
View File

@@ -203,10 +203,9 @@ namespace OpenRA.Mods.Common.Server
public void ClientJoined(S server, Connection conn) public void ClientJoined(S server, Connection conn)
{ {
var client = server.GetClient(conn); var client = server.GetClient(conn);
var slot = server.LobbyInfo.Clients[client.Index].Slot;
// Validate whether color is allowed and get an alternative if it isn't // Validate whether color is allowed and get an alternative if it isn't
if (!server.LobbyInfo.Slots[slot].LockColor) if (client.Slot == null ||!server.LobbyInfo.Slots[client.Slot].LockColor)
client.Color = ColorValidator.ValidatePlayerColorAndGetAlternative(server, client.Color, client.Index); client.Color = ColorValidator.ValidatePlayerColorAndGetAlternative(server, client.Color, client.Index);
} }