diff --git a/OpenRA.Game/Manifest.cs b/OpenRA.Game/Manifest.cs index 3bfe70e905..1878bae660 100644 --- a/OpenRA.Game/Manifest.cs +++ b/OpenRA.Game/Manifest.cs @@ -44,7 +44,6 @@ namespace OpenRA public readonly IReadOnlyDictionary Packages; public readonly IReadOnlyDictionary MapFolders; public readonly MiniYaml LoadScreen; - public readonly MiniYaml LobbyDefaults; public readonly Dictionary RequiresMods; public readonly Dictionary> Fonts; @@ -98,9 +97,6 @@ namespace OpenRA if (!yaml.TryGetValue("LoadScreen", out LoadScreen)) throw new InvalidDataException("`LoadScreen` section is not defined."); - if (!yaml.TryGetValue("LobbyDefaults", out LobbyDefaults)) - throw new InvalidDataException("`LobbyDefaults` section is not defined."); - Fonts = yaml["Fonts"].ToDictionary(my => { var nd = my.ToDictionary(); diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index d07f9ed75b..0d14b76022 100644 --- a/OpenRA.Game/Server/Server.cs +++ b/OpenRA.Game/Server/Server.cs @@ -154,8 +154,6 @@ namespace OpenRA.Server } }; - FieldLoader.Load(LobbyInfo.GlobalSettings, modData.Manifest.LobbyDefaults); - new Thread(_ => { foreach (var t in serverTraits.WithInterface()) @@ -608,10 +606,7 @@ namespace OpenRA.Server DispatchOrders(toDrop, frame, new byte[] { 0xbf }); if (!Conns.Any()) - { - FieldLoader.Load(LobbyInfo.GlobalSettings, ModData.Manifest.LobbyDefaults); TempBans.Clear(); - } if (Conns.Any() || LobbyInfo.GlobalSettings.Dedicated) SyncLobbyClients(); diff --git a/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs b/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs index e273532642..342623f468 100644 --- a/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs +++ b/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs @@ -24,7 +24,6 @@ namespace OpenRA.Mods.Common.Server return; var defaults = new Session.Global(); - FieldLoader.Load(defaults, Game.ModData.Manifest.LobbyDefaults); if (server.LobbyInfo.GlobalSettings.AllowCheats != defaults.AllowCheats) server.SendOrderTo(conn, "Message", "Allow Cheats: {0}".F(server.LobbyInfo.GlobalSettings.AllowCheats)); diff --git a/mods/all/mod.yaml b/mods/all/mod.yaml index cd68ac6c3e..b45aa40a12 100644 --- a/mods/all/mod.yaml +++ b/mods/all/mod.yaml @@ -31,8 +31,6 @@ ChromeMetrics: Fonts: -LobbyDefaults: - SoundFormats: SpriteFormats: diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index fde435bd22..6ef4201c25 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -162,8 +162,6 @@ ServerTraits: MasterServerPinger LobbySettingsNotification -LobbyDefaults: - ChromeMetrics: common|metrics.yaml cnc|metrics.yaml diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index c13df25f65..293205472d 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -155,8 +155,6 @@ ServerTraits: MasterServerPinger LobbySettingsNotification -LobbyDefaults: - ChromeMetrics: common|metrics.yaml d2k|metrics.yaml diff --git a/mods/modchooser/mod.yaml b/mods/modchooser/mod.yaml index f34ff92ef8..96ce3e0d00 100644 --- a/mods/modchooser/mod.yaml +++ b/mods/modchooser/mod.yaml @@ -53,8 +53,6 @@ Fonts: Font: common|FreeSansBold.ttf Size:10 -LobbyDefaults: - SoundFormats: SpriteFormats: ShpTD diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index 35163e80f4..1a82d24cf8 100644 --- a/mods/ra/mod.yaml +++ b/mods/ra/mod.yaml @@ -165,8 +165,6 @@ ServerTraits: MasterServerPinger LobbySettingsNotification -LobbyDefaults: - ChromeMetrics: common|metrics.yaml ra|metrics.yaml diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index 64903791f4..371bcdd251 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -214,8 +214,6 @@ ServerTraits: MasterServerPinger LobbySettingsNotification -LobbyDefaults: - ChromeMetrics: common|metrics.yaml ts|metrics.yaml