From 93475bab7fe692773350e227e1eae55c567ae8bf Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Mon, 23 Mar 2020 22:32:57 -0400 Subject: fix asset changes not propagating to NPCs in an event --- src/SMAPI/Metadata/CoreAssetPropagator.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/SMAPI') 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 /// Get all NPCs in the game (excluding farm animals). private IEnumerable 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; + } } /// Get all farm animals in the game. -- cgit From 68def4aa8a0a7909948849fc7be971eba05b6bb2 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Tue, 24 Mar 2020 19:16:51 -0400 Subject: fix mouse input suppression broken in SMAPI 3.4 (#705) --- src/SMAPI/Framework/Input/MouseStateBuilder.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/SMAPI') diff --git a/src/SMAPI/Framework/Input/MouseStateBuilder.cs b/src/SMAPI/Framework/Input/MouseStateBuilder.cs index cff3e05e..59956feb 100644 --- a/src/SMAPI/Framework/Input/MouseStateBuilder.cs +++ b/src/SMAPI/Framework/Input/MouseStateBuilder.cs @@ -66,9 +66,11 @@ namespace StardewModdingAPI.Framework.Input { foreach (var pair in overrides) { - bool isDown = pair.Value.IsDown(); if (this.ButtonStates.ContainsKey(pair.Key)) - this.ButtonStates[pair.Key] = isDown ? ButtonState.Pressed : ButtonState.Released; + { + this.State = null; + this.ButtonStates[pair.Key] = pair.Value.IsDown() ? ButtonState.Pressed : ButtonState.Released; + } } return this; -- cgit From 31db04f4a0814193c98f8875b09aa9bbfa7e0ec5 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Tue, 24 Mar 2020 21:02:05 -0400 Subject: prepare for release --- src/SMAPI/Constants.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/SMAPI') diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs index d66e9d6b..128e23bd 100644 --- a/src/SMAPI/Constants.cs +++ b/src/SMAPI/Constants.cs @@ -20,7 +20,7 @@ namespace StardewModdingAPI ** Public ****/ /// SMAPI's current semantic version. - public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.4.0"); + public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.4.1"); /// The minimum supported version of Stardew Valley. public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.4.1"); -- cgit