Merge branch 'develop' into stable

build/GlobalAssemblyInfo.cs

@@ -1,5 +1,5 @@
 using System.Reflection;
 
 [assembly: AssemblyProduct("SMAPI")]
-[assembly: AssemblyVersion("2.9.2")]
-[assembly: AssemblyFileVersion("2.9.2")]
+[assembly: AssemblyVersion("2.9.3")]
+[assembly: AssemblyFileVersion("2.9.3")]

docs/release-notes.md

@@ -1,4 +1,9 @@
 # Release notes
+## 2.9.3
+* For players:
+  * Fixed errors hovering items in some cases with SMAPI 2.9.2.
+  * Fixed some multiplayer features broken when a farmhand returns to title and rejoins.
+
 ## 2.9.2
 * For players:
   * SMAPI now prevents invalid items from crashing the game on hover.

src/SMAPI.Mods.ConsoleCommands/manifest.json

@@ -1,9 +1,9 @@
 {
   "Name": "Console Commands",
   "Author": "SMAPI",
-  "Version": "2.9.2",
+  "Version": "2.9.3",
   "Description": "Adds SMAPI console commands that let you manipulate the game.",
   "UniqueID": "SMAPI.ConsoleCommands",
   "EntryDll": "ConsoleCommands.dll",
-  "MinimumApiVersion": "2.9.2"
+  "MinimumApiVersion": "2.9.3"
 }

src/SMAPI.Mods.SaveBackup/manifest.json

@@ -1,9 +1,9 @@
 {
   "Name": "Save Backup",
   "Author": "SMAPI",
-  "Version": "2.9.2",
+  "Version": "2.9.3",
   "Description": "Automatically backs up all your saves once per day into its folder.",
   "UniqueID": "SMAPI.SaveBackup",
   "EntryDll": "SaveBackup.dll",
-  "MinimumApiVersion": "2.9.2"
+  "MinimumApiVersion": "2.9.3"
 }

src/SMAPI/Constants.cs

@@ -29,7 +29,7 @@ public static class Constants
         ** Public
         ****/
         /// <summary>SMAPI's current semantic version.</summary>
-        public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("2.9.2");
+        public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("2.9.3");
 
         /// <summary>The minimum supported version of Stardew Valley.</summary>
         public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.3.32");

src/SMAPI/Framework/SGame.cs

@@ -217,7 +217,7 @@ private void OnModMessageReceived(ModMessageModel message)
         private void OnReturnedToTitle()
         {
             this.Monitor.Log("Context: returned to title", LogLevel.Trace);
-            this.Multiplayer.Peers.Clear();
+            this.Multiplayer.CleanupOnMultiplayerExit();
             this.Events.ReturnedToTitle.RaiseEmpty();
 #if !SMAPI_3_0_STRICT
             this.Events.Legacy_AfterReturnToTitle.Raise();

src/SMAPI/Framework/SMultiplayer.cs

@@ -82,6 +82,13 @@ public SMultiplayer(IMonitor monitor, EventManager eventManager, JsonHelper json
             this.OnModMessageReceived = onModMessageReceived;
         }
 
+        /// <summary>Perform cleanup needed when a multiplayer session ends.</summary>
+        public void CleanupOnMultiplayerExit()
+        {
+            this.Peers.Clear();
+            this.HostPeer = null;
+        }
+
 #if !SMAPI_3_0_STRICT
         /// <summary>Handle sync messages from other players and perform other initial sync logic.</summary>
         public override void UpdateEarly()

src/SMAPI/Patches/ObjectErrorPatch.cs

@@ -49,7 +49,7 @@ private static bool Prefix(SObject __instance, ref string __result)
                 return false;
             }
 
-            return false;
+            return true;
         }
     }
 }