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

Fixes data file loading (#145)

Browse source
This commit is contained in:
Kamron Batman 2020-05-25 00:37:46 -07:00 • committed by GitHub
parent eb0f960be6
commit 5ea11cef11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 70 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Projects/Server/Main.cs
View file

@ -178,7 +178,7 @@ namespace Server
public static int ScriptItems => m_ItemCount;
public static int ScriptMobiles => m_MobileCount;
public static string FindDataFile(string path)
public static string FindDataFile(string path, bool throwNotFound = true, bool warnNotFound = false)
{
string fullPath = null;
@ -192,11 +192,19 @@ namespace Server
fullPath = null;
}
if (fullPath == null && (throwNotFound || warnNotFound))
{
Utility.PushColor(ConsoleColor.Red);
Console.WriteLine($"Data: {path} was not found");
Console.WriteLine("Make sure modernuo.json is properly configured");
Utility.PopColor();
if (throwNotFound)
throw new FileNotFoundException($"Data: {path} was not found");
}
return fullPath;
}
public static string FindDataFile(string format, params object[] args) => FindDataFile(string.Format(format, args));
private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{
Console.WriteLine(e.IsTerminating ? "Error:" : "Warning:");
@ -317,14 +325,13 @@ namespace Server
var ver = Assembly.GetName().Version ?? new Version();
Console.ForegroundColor = ConsoleColor.Green;
Utility.PushColor(ConsoleColor.Green);
// Added to help future code support on forums, as a 'check' people can ask for to it see if they recompiled core or not
Console.WriteLine("ModernUO - [https://github.com/kamronbatman/ModernUO] Version {0}.{1}.{2}.{3}", ver.Major,
Console.WriteLine("ModernUO - [https://github.com/modernuo/modernuo] Version {0}.{1}.{2}.{3}", ver.Major,
ver.Minor, ver.Build,
ver.Revision);
Console.WriteLine("Core: Running on {0}", RuntimeInformation.FrameworkDescription);
Console.ResetColor();
Console.WriteLine();
Console.WriteLine("Core: Running on {0}\n", RuntimeInformation.FrameworkDescription);
Utility.PopColor();
var ttObj = new Timer.TimerThread();
timerThread = new Thread(ttObj.TimerMain)