Merge branch 'develop' into stable

Pathoschild · Mar 25, 2020 · d0dad43 · d0dad43
2 parents 7ca5efb + 31db04f
commit d0dad43
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 9 deletions.
diff --git a/build/common.targets b/build/common.targets
@@ -4,7 +4,7 @@
 
   <!--set properties -->
   <PropertyGroup>
-    <Version>3.4.0</Version>
+    <Version>3.4.1</Version>
     <Product>SMAPI</Product>
 
     <AssemblySearchPaths>$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>

diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -1,6 +1,13 @@
 &larr; [README](README.md)
 
 # Release notes
+## 3.4.1
+Released 24 March 2020 for Stardew Valley 1.4.1 or later.
+
+* For modders:
+  * Asset changes now propagate to NPCs in an event (e.g. wedding sprites).
+  * Fixed mouse input suppression not working in SMAPI 3.4.
+
 ## 3.4
 Released 22 March 2020 for Stardew Valley 1.4.1 or later.
 

diff --git a/src/SMAPI.Mods.ConsoleCommands/manifest.json b/src/SMAPI.Mods.ConsoleCommands/manifest.json
@@ -1,9 +1,9 @@
 {
     "Name": "Console Commands",
     "Author": "SMAPI",
-    "Version": "3.4.0",
+    "Version": "3.4.1",
     "Description": "Adds SMAPI console commands that let you manipulate the game.",
     "UniqueID": "SMAPI.ConsoleCommands",
     "EntryDll": "ConsoleCommands.dll",
-    "MinimumApiVersion": "3.4.0"
+    "MinimumApiVersion": "3.4.1"
 }
diff --git a/src/SMAPI.Mods.SaveBackup/manifest.json b/src/SMAPI.Mods.SaveBackup/manifest.json
@@ -1,9 +1,9 @@
 {
     "Name": "Save Backup",
     "Author": "SMAPI",
-    "Version": "3.4.0",
+    "Version": "3.4.1",
     "Description": "Automatically backs up all your saves once per day into its folder.",
     "UniqueID": "SMAPI.SaveBackup",
     "EntryDll": "SaveBackup.dll",
-    "MinimumApiVersion": "3.4.0"
+    "MinimumApiVersion": "3.4.1"
 }
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
@@ -20,7 +20,7 @@ public static class Constants
         ** Public
         ****/
         /// <summary>SMAPI's current semantic version.</summary>
-        public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.4.0");
+        public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.4.1");
 
         /// <summary>The minimum supported version of Stardew Valley.</summary>
         public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.4.1");

diff --git a/src/SMAPI/Framework/Input/MouseStateBuilder.cs b/src/SMAPI/Framework/Input/MouseStateBuilder.cs
@@ -66,9 +66,11 @@ public MouseStateBuilder OverrideButtons(IDictionary<SButton, SButtonState> over
         {
             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;

diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs
@@ -949,7 +949,14 @@ private void SetSpriteTexture(AnimatedSprite sprite, Texture2D texture)
         /// <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>