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

Load scripts from main assembly only

Browse Source
This commit is contained in:
sardelka9515
2022-08-26 22:58:03 +08:00
parent 8f63fee5b5
commit bac53fd769
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RageCoop.Client/Properties/AssemblyInfo.cs
View File

@ -16,7 +16,7 @@ using System.Resources;
// Version informationr(
[assembly: AssemblyVersion("1.5.3.140")]
[assembly: AssemblyFileVersion("1.5.3.140")]
[assembly: AssemblyVersion("1.5.3.142")]
[assembly: AssemblyFileVersion("1.5.3.142")]
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]

4
RageCoop.Server/Properties/AssemblyInfo.cs
View File

@ -15,7 +15,7 @@ using System.Resources;
[assembly: AssemblyCulture("")]
// Version information
[assembly: AssemblyVersion("1.5.3.118")]
[assembly: AssemblyFileVersion("1.5.3.118")]
[assembly: AssemblyVersion("1.5.3.122")]
[assembly: AssemblyFileVersion("1.5.3.122")]
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]

22
RageCoop.Server/Scripting/ServerResource.cs
View File

@ -81,16 +81,20 @@ namespace RageCoop.Server.Scripting
}
foreach(var a in assemblies)
{
try
{
r.LoadScriptsFromAssembly(a.Key,a.Value);
}
catch (FileLoadException ex)
{
if (!ex.Message.EndsWith("Assembly with same name is already loaded"))
if(a.Key.Name.ToLower() == r.Name.ToLower()+".dll")
{
try
{
logger?.Warning("Failed to load assembly: "+a.Key.Name);
logger?.Trace(ex.Message);
r.LoadScriptsFromAssembly(a.Key, a.Value);
}
catch (FileLoadException ex)
{
if (!ex.Message.EndsWith("Assembly with same name is already loaded"))
{
logger?.Warning("Failed to load assembly: " + a.Key.Name);
logger?.Trace(ex.Message);
}
}
}
}