summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoratravita-mods <94934860+atravita-mods@users.noreply.github.com>2023-03-23 22:04:21 -0400
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2023-04-02 15:37:37 -0400
commit58ccaf9a1e3a9e374f07f23b5c3043dd3c0566ba (patch)
treea27da1d14bd98c5f6c5e95fc80bdef341844e63a
parent7b5566d0751bec14c5bf93b727fa66e7c58fbf00 (diff)
downloadSMAPI-58ccaf9a1e3a9e374f07f23b5c3043dd3c0566ba.tar.gz
SMAPI-58ccaf9a1e3a9e374f07f23b5c3043dd3c0566ba.tar.bz2
SMAPI-58ccaf9a1e3a9e374f07f23b5c3043dd3c0566ba.zip
avoid resolving empty folders.
-rw-r--r--src/SMAPI/Framework/ModLoading/ModResolver.cs1
-rw-r--r--src/SMAPI/Framework/SCore.cs2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs
index cb62e16f..40d8b3bc 100644
--- a/src/SMAPI/Framework/ModLoading/ModResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs
@@ -178,6 +178,7 @@ namespace StardewModdingAPI.Framework.ModLoading
string[] lateArray = modIdsToLoadLate.ToArray();
return mods
+ .Where(mod => mod.FailReason is not null)
.OrderBy(mod =>
{
string id = mod.Manifest.UniqueID;
diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index 1d146d5f..37ca1556 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -433,7 +433,7 @@ namespace StardewModdingAPI.Framework
// apply load order customizations
if (this.Settings.ModsToLoadEarly.Any() || this.Settings.ModsToLoadLate.Any())
{
- HashSet<string> installedIds = new HashSet<string>(mods.Select(p => p.Manifest.UniqueID), StringComparer.OrdinalIgnoreCase);
+ HashSet<string> installedIds = new HashSet<string>(mods.Where(p => p.FailReason is null).Select(p => p.Manifest.UniqueID), StringComparer.OrdinalIgnoreCase);
string[] missingEarlyMods = this.Settings.ModsToLoadEarly.Where(id => !installedIds.Contains(id)).OrderBy(p => p, StringComparer.OrdinalIgnoreCase).ToArray();
string[] missingLateMods = this.Settings.ModsToLoadLate.Where(id => !installedIds.Contains(id)).OrderBy(p => p, StringComparer.OrdinalIgnoreCase).ToArray();