From d867e8200fc33d676b5729bbc3c0b4c6c732aa33 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 4 Aug 2013 12:06:47 +1200 Subject: [PATCH] Reset default state when a dedicated server clears. --- OpenRA.Game/Server/Server.cs | 3 +++ mods/cnc/mod.yaml | 4 ++++ mods/d2k/mod.yaml | 4 ++++ mods/ra/mod.yaml | 4 ++++ mods/ts/mod.yaml | 4 ++++ 5 files changed, 19 insertions(+) diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index 591e4ade0a..cfd618afa4 100644 --- a/OpenRA.Game/Server/Server.cs +++ b/OpenRA.Game/Server/Server.cs @@ -527,7 +527,10 @@ namespace OpenRA.Server DispatchOrders(toDrop, toDrop.MostRecentFrame, new byte[] {0xbf}); if (!conns.Any()) + { + FieldLoader.Load(lobbyInfo.GlobalSettings, ModData.Manifest.LobbyDefaults); TempBans.Clear(); + } if (conns.Any() || lobbyInfo.GlobalSettings.Dedicated) SyncLobbyInfo(); diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index de89d70c9b..0c325bed6b 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -119,6 +119,10 @@ ServerTraits: MasterServerPinger LobbyDefaults: + AllowCheats: false + Crates: true + StartingUnitsClass: default + FragileAlliances: false ChromeMetrics: mods/cnc/metrics.yaml diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index 734c68807a..0509fe4abd 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -105,6 +105,10 @@ ServerTraits: MasterServerPinger LobbyDefaults: + AllowCheats: false + Crates: true + StartingUnitsClass: default + FragileAlliances: false ChromeMetrics: mods/d2k/metrics.yaml diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index ee61410b09..8cbb3e805a 100644 --- a/mods/ra/mod.yaml +++ b/mods/ra/mod.yaml @@ -121,6 +121,10 @@ ServerTraits: MasterServerPinger LobbyDefaults: + AllowCheats: false + Crates: true + StartingUnitsClass: default + FragileAlliances: false ChromeMetrics: mods/ra/metrics.yaml diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index 73467ff597..b466b1fc1b 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -144,6 +144,10 @@ ServerTraits: MasterServerPinger LobbyDefaults: + AllowCheats: false + Crates: true + StartingUnitsClass: default + FragileAlliances: false ChromeMetrics: mods/ra/metrics.yaml