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

Sandboxing: load from launcher engine before loading from disk load paths.

Browse Source 
Robust.Client.WebView includes Robust.Client.dll and such now, so sandboxing was loading the Robust.Client.dll from there instead of from the running engine itself.
This commit is contained in:
Pieter-Jan Briers
2023-04-15 18:03:53 +02:00
parent 2705e2a56a
commit f3877f3d6a
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

@@ -873,6 +873,12 @@ namespace Robust.Shared.ContentPack
private PEReader? ResolveCore(string simpleName)
{
var dllName = $"{simpleName}.dll";
var extraStream = _parent.ExtraRobustLoader?.Invoke(dllName);
if (extraStream != null)
{
return ModLoader.MakePEReader(extraStream);
}
foreach (var diskLoadPath in _diskLoadPaths)
{
var path = Path.Combine(diskLoadPath, dllName);
@@ -885,12 +891,6 @@ namespace Robust.Shared.ContentPack
return ModLoader.MakePEReader(File.OpenRead(path));
}
var extraStream = _parent.ExtraRobustLoader?.Invoke(dllName);
if (extraStream != null)
{
return ModLoader.MakePEReader(extraStream);
}
foreach (var resLoadPath in _resLoadPaths)
{
try