summaryrefslogtreecommitdiff
path: root/src/SMAPI/Framework/ContentCoordinator.cs
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2020-12-26 11:22:45 -0500
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2020-12-26 11:22:45 -0500
commit48bb1581a6adeabfefbdd774011796e09a07aae2 (patch)
tree81fda584e9bad2d95218db9d7cc41146cc10f3ec /src/SMAPI/Framework/ContentCoordinator.cs
parent71284e7176c55f66754470b19fd74b5b1fda4964 (diff)
parent5ac46b7ab22ad5d6ce558a6b6d6d020971c178bd (diff)
downloadSMAPI-48bb1581a6adeabfefbdd774011796e09a07aae2.tar.gz
SMAPI-48bb1581a6adeabfefbdd774011796e09a07aae2.tar.bz2
SMAPI-48bb1581a6adeabfefbdd774011796e09a07aae2.zip
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI/Framework/ContentCoordinator.cs')
-rw-r--r--src/SMAPI/Framework/ContentCoordinator.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/SMAPI/Framework/ContentCoordinator.cs b/src/SMAPI/Framework/ContentCoordinator.cs
index 93371415..f9027972 100644
--- a/src/SMAPI/Framework/ContentCoordinator.cs
+++ b/src/SMAPI/Framework/ContentCoordinator.cs
@@ -278,7 +278,7 @@ namespace StardewModdingAPI.Framework
return this.ContentManagerLock.InReadLock(() =>
{
List<object> values = new List<object>();
- foreach (IContentManager content in this.ContentManagers.Where(p => !p.IsNamespaced && p.IsLoaded(assetName)))
+ foreach (IContentManager content in this.ContentManagers.Where(p => !p.IsNamespaced && p.IsLoaded(assetName, p.Language)))
{
object value = content.Load<object>(assetName, this.Language, useCache: true);
values.Add(value);