From 082ccfe5d6e048b73ec7b85d4265b6b64ec4a9c9 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Wed, 14 Sep 2016 20:14:15 +0200 Subject: [PATCH] Fix kicking players joining servers hosting a map with non-default rules Specifically, rules that remove traits which implement ILobbyOptions --- OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs b/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs index a0c8b1e1a3..c5b8af4725 100644 --- a/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs +++ b/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs @@ -35,8 +35,10 @@ namespace OpenRA.Mods.Common.Server foreach (var kv in server.LobbyInfo.GlobalSettings.LobbyOptions) { Session.LobbyOptionState def; + LobbyOption option; if (!defaults.LobbyOptions.TryGetValue(kv.Key, out def) || kv.Value.Value != def.Value) - server.SendOrderTo(conn, "Message", options[kv.Key].Name + ": " + kv.Value.Value); + if (options.TryGetValue(kv.Key, out option)) + server.SendOrderTo(conn, "Message", option.Name + ": " + kv.Value.Value); } } }