Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
ed694ae95b | |||
e9a9e180a8 |
@@ -16,6 +16,7 @@ using Microsoft.Extensions.Configuration;
|
|||||||
using NLog;
|
using NLog;
|
||||||
using NLog.Targets;
|
using NLog.Targets;
|
||||||
using Sandbox.Engine.Utils;
|
using Sandbox.Engine.Utils;
|
||||||
|
using SpaceEngineers.Game;
|
||||||
using Torch.Utils;
|
using Torch.Utils;
|
||||||
using VRage.FileSystem;
|
using VRage.FileSystem;
|
||||||
|
|
||||||
@@ -103,7 +104,8 @@ namespace Torch.Server
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
_server.Init();
|
SpaceEngineersGame.SetupBasicGameInfo();
|
||||||
|
SpaceEngineersGame.SetupPerGameSettings();
|
||||||
var uiThread = new Thread(() =>
|
var uiThread = new Thread(() =>
|
||||||
{
|
{
|
||||||
var ui = new TorchUI(_server);
|
var ui = new TorchUI(_server);
|
||||||
@@ -116,7 +118,7 @@ namespace Torch.Server
|
|||||||
|
|
||||||
uiThread.SetApartmentState(ApartmentState.STA);
|
uiThread.SetApartmentState(ApartmentState.STA);
|
||||||
uiThread.Start();
|
uiThread.Start();
|
||||||
|
_server.Init();
|
||||||
|
|
||||||
|
|
||||||
if (Config.Autostart || Config.TempAutostart)
|
if (Config.Autostart || Config.TempAutostart)
|
||||||
|
@@ -10,7 +10,6 @@ using Sandbox;
|
|||||||
using Sandbox.Game;
|
using Sandbox.Game;
|
||||||
using Sandbox.Game.Multiplayer;
|
using Sandbox.Game.Multiplayer;
|
||||||
using Sandbox.Game.Screens.Helpers;
|
using Sandbox.Game.Screens.Helpers;
|
||||||
using SpaceEngineers.Game;
|
|
||||||
using Torch.API;
|
using Torch.API;
|
||||||
using Torch.API.Managers;
|
using Torch.API.Managers;
|
||||||
using Torch.API.ModAPI;
|
using Torch.API.ModAPI;
|
||||||
@@ -248,8 +247,6 @@ namespace Torch
|
|||||||
public virtual void Init()
|
public virtual void Init()
|
||||||
{
|
{
|
||||||
Debug.Assert(!_init, "Torch instance is already initialized.");
|
Debug.Assert(!_init, "Torch instance is already initialized.");
|
||||||
SpaceEngineersGame.SetupBasicGameInfo();
|
|
||||||
SpaceEngineersGame.SetupPerGameSettings();
|
|
||||||
VRageGame.SetupVersionInfo();
|
VRageGame.SetupVersionInfo();
|
||||||
|
|
||||||
Debug.Assert(MyPerGameSettings.BasicGameInfo.GameVersion != null, "MyPerGameSettings.BasicGameInfo.GameVersion != null");
|
Debug.Assert(MyPerGameSettings.BasicGameInfo.GameVersion != null, "MyPerGameSettings.BasicGameInfo.GameVersion != null");
|
||||||
|
Reference in New Issue
Block a user