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

Merge pull request #12976 from rob-v/ConnectionFailedCustomMap

Browse Source 
Connection Failed when trying to join custom map #12881
This commit is contained in:
abcdefg30
2017-04-11 13:15:23 +02:00
committed by GitHub
parent e37667efb6 c3255e275c
commit 3808a1885e
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs
View File

@@ -9,8 +9,8 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Network;
using OpenRA.Server;
using OpenRA.Traits;
@@ -29,16 +29,19 @@ namespace OpenRA.Mods.Common.Server
var options = server.Map.Rules.Actors["player"].TraitInfos<ILobbyOptions>()
.Concat(server.Map.Rules.Actors["world"].TraitInfos<ILobbyOptions>())
.SelectMany(t => t.LobbyOptions(server.Map.Rules))
.ToDictionary(o => o.Id, o => o);
.SelectMany(t => t.LobbyOptions(server.Map.Rules));
var optionNames = new Dictionary<string, string>();
foreach (var o in options)
optionNames[o.Id] = o.Name;
foreach (var kv in server.LobbyInfo.GlobalSettings.LobbyOptions)
{
Session.LobbyOptionState def;
LobbyOption option;
string optionName;
if (!defaults.LobbyOptions.TryGetValue(kv.Key, out def) || kv.Value.Value != def.Value)
if (options.TryGetValue(kv.Key, out option))
server.SendOrderTo(conn, "Message", option.Name + ": " + kv.Value.Value);
if (optionNames.TryGetValue(kv.Key, out optionName))
server.SendOrderTo(conn, "Message", optionName + ": " + kv.Value.Value);
}
}
}