summaryrefslogtreecommitdiff
path: root/src/StardewModdingAPI/Framework
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <github@jplamondonw.com>2017-08-23 17:53:33 -0400
committerJesse Plamondon-Willard <github@jplamondonw.com>2017-08-23 17:53:33 -0400
commit8df1ab7e1102dedf744e799af2cede560893c92a (patch)
treeda4d29ef930d381e7bfcf94309be76f3c99f1bda /src/StardewModdingAPI/Framework
parent8ba54a682fd7de3756b6ddd262b232cf40d23ea0 (diff)
parent7d5f95a6db3b432870097e3f1e0699f6202a41c2 (diff)
downloadSMAPI-8df1ab7e1102dedf744e799af2cede560893c92a.tar.gz
SMAPI-8df1ab7e1102dedf744e799af2cede560893c92a.tar.bz2
SMAPI-8df1ab7e1102dedf744e799af2cede560893c92a.zip
Merge branch 'develop' into stable
Diffstat (limited to 'src/StardewModdingAPI/Framework')
-rw-r--r--src/StardewModdingAPI/Framework/ModLoading/AssemblyLoader.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/StardewModdingAPI/Framework/ModLoading/AssemblyLoader.cs b/src/StardewModdingAPI/Framework/ModLoading/AssemblyLoader.cs
index b14ae56f..e6ec21a6 100644
--- a/src/StardewModdingAPI/Framework/ModLoading/AssemblyLoader.cs
+++ b/src/StardewModdingAPI/Framework/ModLoading/AssemblyLoader.cs
@@ -76,7 +76,7 @@ namespace StardewModdingAPI.Framework.ModLoading
: $"Could not load '{assemblyPath}'."
);
}
- if (assemblies[0].Status == AssemblyLoadStatus.AlreadyLoaded)
+ if (assemblies.Last().Status == AssemblyLoadStatus.AlreadyLoaded) // mod assembly is last in dependency order
throw new SAssemblyLoadFailedException($"Could not load '{assemblyPath}' because it was already loaded. Do you have two copies of this mod?");
// rewrite & load assemblies in leaf-to-root order