diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index d186f6aeeb..d07f9ed75b 100644 --- a/OpenRA.Game/Server/Server.cs +++ b/OpenRA.Game/Server/Server.cs @@ -156,14 +156,14 @@ namespace OpenRA.Server FieldLoader.Load(LobbyInfo.GlobalSettings, modData.Manifest.LobbyDefaults); - foreach (var t in serverTraits.WithInterface()) - t.ServerStarted(this); - - Log.Write("server", "Initial mod: {0}", ModData.Manifest.Mod.Id); - Log.Write("server", "Initial map: {0}", LobbyInfo.GlobalSettings.Map); - new Thread(_ => { + foreach (var t in serverTraits.WithInterface()) + t.ServerStarted(this); + + Log.Write("server", "Initial mod: {0}", ModData.Manifest.Mod.Id); + Log.Write("server", "Initial map: {0}", LobbyInfo.GlobalSettings.Map); + var timeout = serverTraits.WithInterface().Min(t => t.TickTimeout); for (;;) {