From 63ac99f97a0be81b6b93fa8d0ed58df79607cc3b Mon Sep 17 00:00:00 2001
From: John Gross <mindstorms11@cox.net>
Date: Fri, 25 Jan 2019 13:16:14 -0800
Subject: [PATCH] Revert "Change init order to ensure paths are initialized for
 plugins"

This reverts commit 3f803b8107bcc16516662f024af8ecd3ac6032e5.
---
 Torch.Server/TorchServer.cs | 2 --
 Torch/TorchBase.cs          | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

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<ITorchSessionManager>().SessionStateChanged += OnSessionStateChanged;
             GetManager<InstanceManager>().LoadInstance(Config.InstancePath);
-            GetManager<PluginManager>().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<PluginManager>().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");