diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2023-04-09 13:09:47 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2023-04-09 13:09:47 -0400 |
| commit | 53e0e8cd2410e63c7725206db4a8156cc460d111 (patch) | |
| tree | fce91f1b31a1beaa0cfb017c76dd766f9496b40d /src/SMAPI/Framework/ModLoading/ModResolver.cs | |
| parent | b4e95a92b33c541d36379d69d3650c5c22ea324c (diff) | |
| parent | 46947683cd7c444d2afc8583198e1f103e905007 (diff) | |
| download | SMAPI-53e0e8cd2410e63c7725206db4a8156cc460d111.tar.gz SMAPI-53e0e8cd2410e63c7725206db4a8156cc460d111.tar.bz2 SMAPI-53e0e8cd2410e63c7725206db4a8156cc460d111.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI/Framework/ModLoading/ModResolver.cs')
| -rw-r--r-- | src/SMAPI/Framework/ModLoading/ModResolver.cs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs index cb62e16f..607bb70d 100644 --- a/src/SMAPI/Framework/ModLoading/ModResolver.cs +++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs @@ -180,13 +180,16 @@ namespace StardewModdingAPI.Framework.ModLoading return mods .OrderBy(mod => { - string id = mod.Manifest.UniqueID; + string? id = mod.Manifest?.UniqueID; - if (modIdsToLoadEarly.TryGetValue(id, out string? actualId)) - return -int.MaxValue + Array.IndexOf(earlyArray, actualId); + if (id is not null) + { + if (modIdsToLoadEarly.TryGetValue(id, out string? actualId)) + return -int.MaxValue + Array.IndexOf(earlyArray, actualId); - if (modIdsToLoadLate.TryGetValue(id, out actualId)) - return int.MaxValue - Array.IndexOf(lateArray, actualId); + if (modIdsToLoadLate.TryGetValue(id, out actualId)) + return int.MaxValue - Array.IndexOf(lateArray, actualId); + } return 0; }) |