space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Further fixes to loader exe.

Browse Source 
Fix ordering of loads.
Fix loads.
This commit is contained in:
Pieter-Jan Briers
2020-12-13 16:12:32 +01:00
parent 7ef2fd46da
commit 13e9fe12ce
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Robust.Shared/ContentPack/AssemblyTypeChecker.cs
View File

@@ -752,6 +752,12 @@ namespace Robust.Shared.ContentPack
}
}
var extraStream = _parent.ExtraRobustLoader?.Invoke(dllName);
if (extraStream != null)
{
return new PEReader(extraStream);
}
foreach (var resLoadPath in _resLoadPaths)
{
try
@@ -764,12 +770,6 @@ namespace Robust.Shared.ContentPack
}
}
var extraStream = _parent.ExtraRobustLoader?.Invoke(dllName);
if (extraStream != null)
{
return new PEReader(extraStream);
}
return null;
}
}