summaryrefslogtreecommitdiff
path: root/src/SMAPI
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2020-03-23 22:32:57 -0400
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2020-03-23 22:32:57 -0400
commit93475bab7fe692773350e227e1eae55c567ae8bf (patch)
tree199bef41ba5a029e28e5a0d8ef115518db8716b3 /src/SMAPI
parent7ca5efbbc576f3c6c43493654b2a0ac040fd4f31 (diff)
downloadSMAPI-93475bab7fe692773350e227e1eae55c567ae8bf.tar.gz
SMAPI-93475bab7fe692773350e227e1eae55c567ae8bf.tar.bz2
SMAPI-93475bab7fe692773350e227e1eae55c567ae8bf.zip
fix asset changes not propagating to NPCs in an event
Diffstat (limited to 'src/SMAPI')
-rw-r--r--src/SMAPI/Metadata/CoreAssetPropagator.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs
index 8d5ad3ab..83e553ff 100644
--- a/src/SMAPI/Metadata/CoreAssetPropagator.cs
+++ b/src/SMAPI/Metadata/CoreAssetPropagator.cs
@@ -949,7 +949,14 @@ namespace StardewModdingAPI.Metadata
/// <summary>Get all NPCs in the game (excluding farm animals).</summary>
private IEnumerable<NPC> GetCharacters()
{
- return this.GetLocations().SelectMany(p => p.characters);
+ foreach (NPC character in this.GetLocations().SelectMany(p => p.characters))
+ yield return character;
+
+ if (Game1.CurrentEvent?.actors != null)
+ {
+ foreach (NPC character in Game1.CurrentEvent.actors)
+ yield return character;
+ }
}
/// <summary>Get all farm animals in the game.</summary>