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

Avoid crash when parsing an order with duplicate IDs.

Browse Source
This commit is contained in:
Paul Chote
2016-06-14 20:09:07 +01:00
parent 7c2d938327
commit 6570e1b22e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
View File

@@ -433,10 +433,14 @@ namespace OpenRA.Mods.Common.Server
return true; return true;
} }
var options = server.Map.Rules.Actors["player"].TraitInfos<ILobbyOptions>() var allOptions = server.Map.Rules.Actors["player"].TraitInfos<ILobbyOptions>()
.Concat(server.Map.Rules.Actors["world"].TraitInfos<ILobbyOptions>()) .Concat(server.Map.Rules.Actors["world"].TraitInfos<ILobbyOptions>())
.SelectMany(t => t.LobbyOptions(server.Map.Rules)) .SelectMany(t => t.LobbyOptions(server.Map.Rules));
.ToDictionary(o => o.Id, o => o);
// Overwrite keys with duplicate ids
var options = new Dictionary<string, LobbyOption>();
foreach (var o in allOptions)
options[o.Id] = o;
var split = s.Split(' '); var split = s.Split(' ');
LobbyOption option; LobbyOption option;