From 98134fab5d0a9eea047cf84e62eab93981fe17b4 Mon Sep 17 00:00:00 2001
From: Pavel Penev <penev92@gmail.com>
Date: Sat, 7 Nov 2015 20:27:10 +0200
Subject: [PATCH] Validate player color when changing slots in the lobby

---
 OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
index bcb18c402c..275478d9a9 100644
--- a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
+++ b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
@@ -135,6 +135,10 @@ namespace OpenRA.Mods.Common.Server
 
 						client.Slot = s;
 						S.SyncClientToPlayerReference(client, server.MapPlayers.Players[s]);
+
+						var validatedColor = ColorValidator.ValidatePlayerColorAndGetAlternative(server, client.Color, client.Index, conn);
+						client.PreferredColor = client.Color = validatedColor;
+
 						server.SyncLobbyClients();
 						CheckAutoStart(server);