Fixed assembly loading resolver

BUTR · Oct 27, 2022 · 027ffd2 · 027ffd2
1 parent 03740ff
commit 027ffd2
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/src/Bannerlord.BUTRLoader/Features/AssemblyResolver/Patches/AssemblyLoaderPatch.cs b/src/Bannerlord.BUTRLoader/Features/AssemblyResolver/Patches/AssemblyLoaderPatch.cs
@@ -9,11 +9,8 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-using TaleWorlds.Engine;
 using TaleWorlds.Library;
 
-using Path = System.IO.Path;
-
 namespace Bannerlord.BUTRLoader.Features.AssemblyResolver.Patches
 {
     internal static class AssemblyLoaderPatch
@@ -33,16 +30,10 @@ private static bool OnAssemblyResolvePrefix(ref Assembly? __result, ResolveEvent
         {
             try
             {
-                var basePath = Utilities.GetBasePath();
-                var configName = Common.ConfigName;
-                var modulePath = Path.GetFullPath(Path.Combine(basePath, "Modules"));
-
                 var name = args.Name.Contains(',') ? $"{args.Name.Split(',')[0]}.dll" : args.Name;
 
-                var assemblies = ModuleInfoHelper.GetLoadedModules()
-                    .Select(x => Path.Combine(modulePath, x.Id, "bin", configName))
-                    .Where(Directory.Exists)
-                    .Select(x => Directory.GetFiles(x, "*.dll")).ToArray();
+                var assemblies = ModuleInfoHelper.GetLoadedModules().OfType<ModuleInfoExtendedWithMetadata>()
+                    .Select(x => Directory.GetFiles(x.Path, "*.dll")).ToArray();
 
                 var assembly = assemblies
                     .SelectMany(x => x)