Fixed Merge Issues

LavaGang · Oct 15, 2024 · db47c39 · db47c39
1 parent 1f8c558
commit db47c39
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/MelonLoader/Resolver/AssemblyManager.cs b/MelonLoader/Resolver/AssemblyManager.cs
@@ -49,7 +49,7 @@ private static Assembly Resolve(string requested_name, Version requested_version
                 assembly = MelonAssemblyResolver.SafeInvoke_OnAssemblyResolve(requested_name, requested_version);
 
             // Search Directories
-            if (is_preload && assembly == null)
+            if (is_preload && (assembly == null))
                 assembly = SearchDirectoryManager.Scan(requested_name);
 
             // Load if Valid Assembly
@@ -77,7 +77,7 @@ internal static void LoadInfo(Assembly assembly)
 
 #if NET6_0_OR_GREATER
 
-        private static Assembly Resolve(AssemblyLoadContext alc, AssemblyName name)
+        private static Assembly? Resolve(AssemblyLoadContext alc, AssemblyName name)
             => Resolve(name.Name, name.Version, true);
 
         private static void InstallHooks()

diff --git a/MelonLoader/Resolver/SearchDirectoryManager.cs b/MelonLoader/Resolver/SearchDirectoryManager.cs
@@ -71,11 +71,11 @@ internal static Assembly Scan(string requested_name)
                     continue;
 
                 string filepath = Directory.GetFiles(folderpath).Where(x =>
-                    !string.IsNullOrEmpty(x)
-                    && (Path.GetExtension(x).ToLowerInvariant().Equals(".dll")
-                        && Path.GetFileName(x).Equals($"{requested_name}.dll")
-                    || Path.GetExtension(x).ToLowerInvariant().Equals(".exe")
-                        && Path.GetFileName(x).Equals($"{requested_name}.exe"))
+                    (!string.IsNullOrEmpty(x)
+                        && ((Path.GetExtension(x).ToLowerInvariant().Equals(".dll")
+                            && Path.GetFileName(x).Equals($"{requested_name}.dll"))
+                        || (Path.GetExtension(x).ToLowerInvariant().Equals(".exe")
+                            && Path.GetFileName(x).Equals($"{requested_name}.exe"))))
                 ).FirstOrDefault();
 
                 if (string.IsNullOrEmpty(filepath))