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

Merge pull request #8401 from Mailaender/playercolor-dictionary-exploit

Browse Source 
Fixed an exploit where choosing another players color crashes the game
This commit is contained in:
Pavel Penev
2015-06-10 01:56:23 +03:00
parent 561fba46d3 99c9841274
commit f75da37ebf
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,17 +160,11 @@ namespace OpenRA.Mods.Common.Server
}
// Validate color against other clients
var playerColors = server.LobbyInfo.Clients
.Where(c => c.Index != playerIndex)
.ToDictionary(c => c.Color.RGB, c => c.Name);
if (!ValidateColorAgainstForbidden(askedColor, playerColors.Keys, out forbiddenColor))
var playerColors = server.LobbyInfo.Clients.Where(c => c.Index != playerIndex).Select(c => c.Color.RGB);
if (!ValidateColorAgainstForbidden(askedColor, playerColors, out forbiddenColor))
{
if (connectionToEcho != null)
{
var client = playerColors[forbiddenColor];
server.SendOrderTo(connectionToEcho, "Message", "Color was too similar to {0}, and has been adjusted.".F(client));
}
server.SendOrderTo(connectionToEcho, "Message", "Color was too similar to another player's color, and has been adjusted.");
return false;
}