From ffa147c29fb5610a2df0039eb3655df45cd372f7 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Sat, 24 Apr 2021 09:09:17 +1000
Subject: [PATCH] CLI: Don't just check if MCGalaxy_.dll exists, instead
 properly try to load MCGalaxy_.dll and log an error message if that fails

---
 CLI/Program.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/CLI/Program.cs b/CLI/Program.cs
index 85400dce3..554509946 100644
--- a/CLI/Program.cs
+++ b/CLI/Program.cs
@@ -28,13 +28,17 @@ namespace MCGalaxy.Cli {
         public static void Main(string[] args) {
             Environment.CurrentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 
-            if (!File.Exists("MCGalaxy_.dll")) {
+            // If MCGalaxy_.dll is missing, .NET will throw a FileNotFoundException for MCGalaxy dll
+            try {
+                EnableCLIMode();
+            } catch (FileNotFoundException) {
                 Console.WriteLine("Cannot start server as MCGalaxy_.dll is missing from " + Environment.CurrentDirectory);
                 Console.WriteLine("Download from " + Updater.UploadsURL);
                 Console.WriteLine("Press any key to exit...");
                 Console.ReadKey(true);
                 return;
             }
+            
             // separate method, in case MCGalaxy_.dll is missing
             StartCLI();
         }
@@ -43,13 +47,13 @@ namespace MCGalaxy.Cli {
             try {
                 Server.CLIMode = true;
             } catch {
-                // in case user is running CLI with older MCGalaxy dll
+                // in case user is running CLI with older MCGalaxy dll which lacked CLIMode field
             }
+            Server.RestartPath = Path.GetFileName(Assembly.GetEntryAssembly().Location);
         }
         
         static void StartCLI() {
             FileLogger.Init();
-            Server.RestartPath = Path.GetFileName(Assembly.GetEntryAssembly().Location);
             AppDomain.CurrentDomain.UnhandledException += GlobalExHandler;
             
             try {