warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes configuration console output

Browse source
This commit is contained in:
Kamron Batman 2019-10-04 22:23:06 -07:00
parent feedbeb262
commit 9a1b50aef1
No known key found for this signature in database
GPG key ID: 5C9DFD15804B6BB8
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Projects/Server/Configuration.cs
View file

@ -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();
}

13
Projects/Server/Main.cs
View file

@ -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)
{