From 9fd8c35b462bc19efb520da21cda66f83559a66e Mon Sep 17 00:00:00 2001
From: Michał Dolaś <me@shockah.pl>
Date: Wed, 9 Nov 2022 20:26:50 +0100
Subject: Actually taking order into consideration

---
 src/SMAPI/Framework/ModLoading/ModResolver.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/SMAPI/Framework/ModLoading')

diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs
index f9ba73c4..8ef5e4a8 100644
--- a/src/SMAPI/Framework/ModLoading/ModResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs
@@ -263,8 +263,18 @@ namespace StardewModdingAPI.Framework.ModLoading
 
             // sort mods
             IModMetadata[] allMods = mods.ToArray();
-            IModMetadata[] modsToLoadEarly = allMods.Where(m => modIdsToLoadEarly.Contains(m.Manifest.UniqueID) && !modIdsToLoadLate.Contains(m.Manifest.UniqueID)).ToArray();
-            IModMetadata[] modsToLoadLate = allMods.Where(m => modIdsToLoadLate.Contains(m.Manifest.UniqueID) && !modIdsToLoadEarly.Contains(m.Manifest.UniqueID)).ToArray();
+            IModMetadata[] modsToLoadEarly = modIdsToLoadEarly
+                .Where(modId => !modIdsToLoadLate.Contains(modId))
+                .Select(modId => allMods.FirstOrDefault(m => m.Manifest.UniqueID == modId))
+                .Where(m => m != null)
+                .Select(m => m!)
+                .ToArray();
+            IModMetadata[] modsToLoadLate = modIdsToLoadLate
+                .Where(modId => !modIdsToLoadEarly.Contains(modId))
+                .Select(modId => allMods.FirstOrDefault(m => m.Manifest.UniqueID == modId))
+                .Where(m => m != null)
+                .Select(m => m!)
+                .ToArray();
             IModMetadata[] modsToLoadAsUsual = allMods.Where(m => !modsToLoadEarly.Contains(m) && !modsToLoadLate.Contains(m)).ToArray();
 
             List<IModMetadata> orderSortedMods = new();
-- 
cgit