diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-03-24 21:24:38 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-03-24 21:24:38 -0400 |
| commit | d0dad43e243864eb8bfdf46c853c5c7fba7c55ed (patch) | |
| tree | b43fd6d2a3ad21e477e57eb440523ed73578a0ad /src/SMAPI/Metadata | |
| parent | 7ca5efbbc576f3c6c43493654b2a0ac040fd4f31 (diff) | |
| parent | 31db04f4a0814193c98f8875b09aa9bbfa7e0ec5 (diff) | |
| download | SMAPI-d0dad43e243864eb8bfdf46c853c5c7fba7c55ed.tar.gz SMAPI-d0dad43e243864eb8bfdf46c853c5c7fba7c55ed.tar.bz2 SMAPI-d0dad43e243864eb8bfdf46c853c5c7fba7c55ed.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI/Metadata')
| -rw-r--r-- | src/SMAPI/Metadata/CoreAssetPropagator.cs | 9 |
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> |