expvintl/RAGECOOP-V
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore ready

Browse Source
This commit is contained in:
Sardelka
2022-07-29 18:44:17 +08:00
parent eee6f614f1
commit 3e67cc519e
2 changed files with 13 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
RageCoop.Client/Scripting/Resources.cs
View File

@ -119,6 +119,7 @@ namespace RageCoop.Client.Scripting
private void LoadResource(ZipFile file, string dataFolderRoot)
{
List<Action> toLoad = new List<Action>(10);
var r = new ClientResource()
{
Logger = Main.Logger,
@ -139,53 +140,28 @@ namespace RageCoop.Client.Scripting
if (!entry.IsDirectory)
{
rFile.GetStream=() => { return file.GetInputStream(entry); };
if (entry.Name.EndsWith(".dll"))
if (entry.Name.EndsWith(".dll") && !entry.Name.Contains("/"))
{
var tmp = Path.GetTempFileName();
var f = File.OpenWrite(tmp);
rFile.GetStream().CopyTo(f);
f.Close();
LoadScriptsFromAssembly(rFile, tmp, r, false);
if (!IsManagedAssembly(tmp))
{
continue;
}
var asm=Assembly.LoadFrom(tmp);
toLoad.Add(() => LoadScriptsFromAssembly(rFile,asm, entry.Name,r));
}
}
}
foreach(var a in toLoad)
{
a();
}
LoadedResources.Add(r);
file.Close();
}
private bool LoadScriptsFromAssembly(ResourceFile file, string path, ClientResource resource, bool shadowCopy = true)
{
lock (LoadedResources)
{
if (!IsManagedAssembly(path)) { return false; }
if (ToIgnore.Contains(file.Name)) { try { File.Delete(path); } catch { }; return false; }
Logger?.Debug($"Loading assembly {file.Name} ...");
Assembly assembly;
try
{
if (shadowCopy)
{
var temp = Path.GetTempFileName();
File.Copy(path, temp, true);
assembly = Assembly.LoadFrom(temp);
}
else
{
assembly = Assembly.LoadFrom(path);
}
}
catch (Exception ex)
{
Logger?.Error("Unable to load "+file.Name);
Logger?.Error(ex);
return false;
}
return LoadScriptsFromAssembly(file, assembly, path, resource);
}
}
private bool LoadScriptsFromAssembly(ResourceFile rfile, Assembly assembly, string filename, ClientResource toload)
{
int count = 0;

2
RageCoop.Server/Server.cs
View File

@ -625,7 +625,7 @@ namespace RageCoop.Server
{
if (newClient==_hostClient)
{
_hostClient.SendCustomEvent(CustomEvents.IsHost, true);
API.SendCustomEvent(new() { newClient },CustomEvents.IsHost, true);
}
// Send other players to this client