diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2023-04-02 15:39:46 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2023-04-02 15:39:46 -0400 |
| commit | d13046edb6db5f87b215f6f3830c2a1c1933dbee (patch) | |
| tree | b495f123023db5623d329e44489fc5db039fae70 | |
| parent | 45903dbf3e36058958fce274c79a0a77e7052cb9 (diff) | |
| parent | c12e9d788e71aaee155a4a055c08ccb88f0e8c21 (diff) | |
| download | SMAPI-d13046edb6db5f87b215f6f3830c2a1c1933dbee.tar.gz SMAPI-d13046edb6db5f87b215f6f3830c2a1c1933dbee.tar.bz2 SMAPI-d13046edb6db5f87b215f6f3830c2a1c1933dbee.zip | |
Merge pull request #901 from atravita-mods/develop
Avoid resolving empty folders
| -rw-r--r-- | src/SMAPI/Framework/ModLoading/ModResolver.cs | 5 | ||||
| -rw-r--r-- | src/SMAPI/Framework/SCore.cs | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs index cb62e16f..37aceb1b 100644 --- a/src/SMAPI/Framework/ModLoading/ModResolver.cs +++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs @@ -180,7 +180,10 @@ namespace StardewModdingAPI.Framework.ModLoading return mods .OrderBy(mod => { - string id = mod.Manifest.UniqueID; + string? id = mod.Manifest?.UniqueID; + + if (id is null) + return 0; if (modIdsToLoadEarly.TryGetValue(id, out string? actualId)) return -int.MaxValue + Array.IndexOf(earlyArray, actualId); 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(); |