Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc Fixes

Browse Source
This commit is contained in:
hondacrx
2017-09-01 10:40:03 -04:00
parent 0707f9b377
commit 46c64d37cb
9 changed files with 109 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Game/Scripting/ScriptManager.cs
+18 -19
View File
@@ -56,26 +56,27 @@ namespace Game.Scripting
FillSpellSummary();
if (LoadScripts())
Log.outInfo(LogFilter.ServerLoading, "Loaded {0} C# scripts in {1} ms", GetScriptCount(), Time.GetMSTimeDiffToNow(oldMSTime));
//Load Core Scripts
LoadScripts(Assembly.GetExecutingAssembly());
//Load Scripts.dll
if (!File.Exists("Scripts.dll"))
Log.outError(LogFilter.ServerLoading, "Cant find file {0}, Only Core Scripts are loaded.");
else
{
Assembly asm = Assembly.LoadFile(Path.GetFullPath("Scripts.dll"));
if (asm == null)
Log.outError(LogFilter.ServerLoading, "Error Loading Scripts.dll, Only Core Scripts are loaded.");
else
LoadScripts(asm);
}
Log.outInfo(LogFilter.ServerLoading, $"Loaded {GetScriptCount()} C# scripts in {Time.GetMSTimeDiffToNow(oldMSTime)} ms");
}
public bool LoadScripts(bool reload = false)
public void LoadScripts(Assembly assembly)
{
if (!File.Exists("Scripts.dll"))
{
Log.outError(LogFilter.ServerLoading, "Cant find file {0}, Scripts will not be loaded.");
return false;
}
Assembly asm = Assembly.LoadFile(Path.GetFullPath("Scripts.dll"));
if (asm == null)
{
Log.outError(LogFilter.ServerLoading, "Error Loading Scripts.dll, Scripts will not be loaded.");
return false;
}
foreach (var type in asm.GetTypes())
foreach (var type in assembly.GetTypes())
{
var attributes = (ScriptAttribute[])type.GetCustomAttributes<ScriptAttribute>();
if (attributes.Empty())
@@ -162,8 +163,6 @@ namespace Game.Scripting
}
}
}
return true;
}
public void LoadDatabase()