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

Merge pull request #6573 from obrakmann/fix6572

Browse Source 
Do not validate the color of players which have the LockColor flag set
This commit is contained in:
Matthias Mailänder
2014-09-27 08:15:11 +02:00
parent 8d54efc7af 00dc6f1633
commit 15e5db855a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,9 +203,11 @@ 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 if color is allowed and get an alternative if it isn't // Validate whether color is allowed and get an alternative if it isn't
client.Color = ColorValidator.ValidatePlayerColorAndGetAlternative(server, client.Color, client.Index); if (!server.LobbyInfo.Slots[slot].LockColor)
client.Color = ColorValidator.ValidatePlayerColorAndGetAlternative(server, client.Color, client.Index);
} }
#endregion #endregion