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

Fix loading of core scripts

Browse Source
This commit is contained in:
hondacrx
2017-09-06 18:46:19 -04:00
parent 36a74cf873
commit adbde2e6c2
6 changed files with 108 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Game/Scripting/ScriptManager.cs
+15 -14
View File
@@ -56,26 +56,27 @@ namespace Game.Scripting
FillSpellSummary();
//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);
}
LoadScripts();
Log.outInfo(LogFilter.ServerLoading, $"Loaded {GetScriptCount()} C# scripts in {Time.GetMSTimeDiffToNow(oldMSTime)} ms");
}
public void LoadScripts(Assembly assembly)
public void LoadScripts()
{
if (!File.Exists("Scripts.dll"))
{
Log.outError(LogFilter.ServerLoading, "Cant find file {0}, Only Core Scripts are loaded.");
return;
}
Assembly assembly = Assembly.LoadFile(Path.GetFullPath("Scripts.dll"));
if (assembly == null)
{
Log.outError(LogFilter.ServerLoading, "Error Loading Scripts.dll, Only Core Scripts are loaded.");
return;
}
foreach (var type in assembly.GetTypes())
{
var attributes = (ScriptAttribute[])type.GetCustomAttributes<ScriptAttribute>();