diff --git a/Torch.Server/TorchServer.cs b/Torch.Server/TorchServer.cs index db8fdc4..4832c9c 100644 --- a/Torch.Server/TorchServer.cs +++ b/Torch.Server/TorchServer.cs @@ -18,7 +18,6 @@ using Torch.API; using Torch.API.Managers; using Torch.API.Session; using Torch.Commands; -using Torch.Managers; using Torch.Mod; using Torch.Server.Commands; using Torch.Server.Managers; @@ -101,7 +100,6 @@ namespace Torch.Server base.Init(); Managers.GetManager().SessionStateChanged += OnSessionStateChanged; GetManager().LoadInstance(Config.InstancePath); - GetManager().LoadPlugins(); CanRun = true; Initialized?.Invoke(this); Log.Info($"Initialized server '{Config.InstanceName}' at '{Config.InstancePath}'"); diff --git a/Torch/TorchBase.cs b/Torch/TorchBase.cs index 6a864f1..8f661f8 100644 --- a/Torch/TorchBase.cs +++ b/Torch/TorchBase.cs @@ -334,6 +334,7 @@ namespace Torch Log.Info($"Executing assembly: {Assembly.GetEntryAssembly().FullName}"); Log.Info($"Executing directory: {AppDomain.CurrentDomain.BaseDirectory}"); + Managers.GetManager().LoadPlugins(); Game = new VRageGame(this, TweakGameSettings, SteamAppName, SteamAppId, Config.InstancePath, RunArgs); if (!Game.WaitFor(VRageGame.GameState.Stopped)) Log.Warn("Failed to wait for game to be initialized");