Merge pull request #9324 from atlimit8/ColorSpacePrefixes

Hex Color Parsing
This commit is contained in:
Oliver Brakmann
2015-11-02 20:28:04 +01:00
221 changed files with 12295 additions and 11794 deletions

View File

@@ -169,7 +169,7 @@ namespace OpenRA.Mods.Common.Server
return false;
}
var mapPlayerColors = server.MapPlayers.Players.Values.Select(p => p.ColorRamp.RGB);
var mapPlayerColors = server.MapPlayers.Players.Values.Select(p => p.Color.RGB);
if (!ValidateColorAgainstForbidden(askedColor, mapPlayerColors, out forbiddenColor))
{