summaryrefslogtreecommitdiff
path: root/src/SMAPI
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <github@jplamondonw.com>2017-10-21 21:51:48 -0400
committerJesse Plamondon-Willard <github@jplamondonw.com>2017-10-21 21:51:48 -0400
commit85a8959e97e90b30ac8291904838e18f102e97c2 (patch)
tree1a325f648b1d2a74622ddaa910801a7f157fa4ba /src/SMAPI
parent53df85f3123f8d9cb00013bb32b61c220ccad697 (diff)
downloadSMAPI-85a8959e97e90b30ac8291904838e18f102e97c2.tar.gz
SMAPI-85a8959e97e90b30ac8291904838e18f102e97c2.tar.bz2
SMAPI-85a8959e97e90b30ac8291904838e18f102e97c2.zip
fix mods which implement IAssetLoader being marked as conflicting with themselves
Diffstat (limited to 'src/SMAPI')
-rw-r--r--src/SMAPI/Framework/SContentManager.cs8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/SMAPI/Framework/SContentManager.cs b/src/SMAPI/Framework/SContentManager.cs
index db202567..2f5d104f 100644
--- a/src/SMAPI/Framework/SContentManager.cs
+++ b/src/SMAPI/Framework/SContentManager.cs
@@ -510,16 +510,12 @@ namespace StardewModdingAPI.Framework
{
foreach (var entry in entries)
{
- IModMetadata metadata = entry.Key;
+ IModMetadata mod = entry.Key;
IList<T> interceptors = entry.Value;
- // special case if mod is an interceptor
- if (metadata.Mod is T modAsInterceptor)
- yield return new KeyValuePair<IModMetadata, T>(metadata, modAsInterceptor);
-
// registered editors
foreach (T interceptor in interceptors)
- yield return new KeyValuePair<IModMetadata, T>(metadata, interceptor);
+ yield return new KeyValuePair<IModMetadata, T>(mod, interceptor);
}
}