From 30b8638f8c51ba71db39930233bcdefadd66490f Mon Sep 17 00:00:00 2001
From: Herp Derpinstine <herpderpinstine@gmail.com>
Date: Mon, 14 Oct 2024 00:20:50 -0600
Subject: [PATCH] Revert "Fixed an issue with Melons and UserLibs becoming File
 Locked after Loading"

This reverts commit eafab462317b787594e137ac5a4c19ddc52d4394.
---
 MelonLoader/Melons/MelonAssembly.cs      | 7 ++++++-
 MelonLoader/Melons/MelonFolderHandler.cs | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/MelonLoader/Melons/MelonAssembly.cs b/MelonLoader/Melons/MelonAssembly.cs
index 901f5059..8806bdc0 100644
--- a/MelonLoader/Melons/MelonAssembly.cs
+++ b/MelonLoader/Melons/MelonAssembly.cs
@@ -80,7 +80,12 @@ public static MelonAssembly LoadMelonAssembly(string path, bool loadMelons = tru
 
             try
             {
-                return LoadRawMelonAssembly(path, File.ReadAllBytes(path), null, loadMelons);
+#if NET6_0_OR_GREATER
+                var assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(path);
+#else
+                var assembly = Assembly.LoadFrom(path);
+#endif
+                return LoadMelonAssembly(path, assembly, loadMelons);
             }
             catch (Exception ex)
             {
diff --git a/MelonLoader/Melons/MelonFolderHandler.cs b/MelonLoader/Melons/MelonFolderHandler.cs
index 457c7c44..3bcd3398 100644
--- a/MelonLoader/Melons/MelonFolderHandler.cs
+++ b/MelonLoader/Melons/MelonFolderHandler.cs
@@ -102,9 +102,10 @@ private static void ProcessFolder<T>(string path,
 
             // Get Directories
             var directories = Directory.GetDirectories(path, "*", SearchOption.AllDirectories);
+
+            // Add Directories to Resolver
             if ((directories != null) && (directories.Length > 0))
             {
-                // Add Directories to Resolver
                 foreach (var dir in directories)
                 {
                     // Validate Path