diff --git a/Projects/Server/Configuration.cs b/Projects/Server/Configuration.cs index 6d7743eb6..ee436f09f 100644 --- a/Projects/Server/Configuration.cs +++ b/Projects/Server/Configuration.cs @@ -31,7 +31,8 @@ namespace Server private static Configuration ReadConfiguration() { - Console.Write($"Reading configuration from {FilePath}..."); + string relPath = new Uri($"{Core.BaseDirectory}/").MakeRelativeUri(new Uri(FilePath)).ToString(); + Console.Write($"Reading configuration from {relPath}..."); Configuration config; if (File.Exists(FilePath)) @@ -44,7 +45,7 @@ namespace Server } else { - Console.WriteLine("not found."); + Console.WriteLine("not found"); config = new Configuration(); } diff --git a/Projects/Server/Main.cs b/Projects/Server/Main.cs index 12ab3138a..d178f016f 100644 --- a/Projects/Server/Main.cs +++ b/Projects/Server/Main.cs @@ -231,10 +231,7 @@ namespace Server return fullPath; } - public static string FindDataFile(string format, params object[] args) - { - return FindDataFile(string.Format(format, args)); - } + public static string FindDataFile(string format, params object[] args) => FindDataFile(string.Format(format, args)); private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) { @@ -398,6 +395,14 @@ namespace Server Console.ResetColor(); Console.WriteLine(); + Configuration config = Configuration.Instance; + foreach (string dir in config.DataDirectories.Where(dir => !Directory.Exists(dir))) + { + Console.ForegroundColor = ConsoleColor.DarkYellow; + Console.WriteLine("Core: Config directory {0} does not exist.", dir); + Console.ResetColor(); + } + Timer.TimerThread ttObj = new Timer.TimerThread(); timerThread = new Thread(ttObj.TimerMain) {