diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2018-12-16 20:41:26 -0500 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2018-12-16 20:41:26 -0500 |
| commit | 82beefd8531467de318c1881afd15a258d489f37 (patch) | |
| tree | cedc28e33b97aa8997272f05bc20b90577eda9ee /src/SMAPI | |
| parent | b214a76965d98ca785b64b490533b6bf66371a48 (diff) | |
| parent | a6f74e8fd4da62a7770f1697c6162313b30ba525 (diff) | |
| download | SMAPI-82beefd8531467de318c1881afd15a258d489f37.tar.gz SMAPI-82beefd8531467de318c1881afd15a258d489f37.tar.bz2 SMAPI-82beefd8531467de318c1881afd15a258d489f37.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI')
| -rw-r--r-- | src/SMAPI/Constants.cs | 2 | ||||
| -rw-r--r-- | src/SMAPI/Framework/SGame.cs | 2 | ||||
| -rw-r--r-- | src/SMAPI/Framework/SMultiplayer.cs | 7 | ||||
| -rw-r--r-- | src/SMAPI/Patches/ObjectErrorPatch.cs | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs index 13c30032..2d67284e 100644 --- a/src/SMAPI/Constants.cs +++ b/src/SMAPI/Constants.cs @@ -29,7 +29,7 @@ namespace StardewModdingAPI ** 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"); diff --git a/src/SMAPI/Framework/SGame.cs b/src/SMAPI/Framework/SGame.cs index 4d790d9f..d515d3ad 100644 --- a/src/SMAPI/Framework/SGame.cs +++ b/src/SMAPI/Framework/SGame.cs @@ -217,7 +217,7 @@ namespace StardewModdingAPI.Framework 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(); diff --git a/src/SMAPI/Framework/SMultiplayer.cs b/src/SMAPI/Framework/SMultiplayer.cs index 784edae3..29d9b2b8 100644 --- a/src/SMAPI/Framework/SMultiplayer.cs +++ b/src/SMAPI/Framework/SMultiplayer.cs @@ -82,6 +82,13 @@ namespace StardewModdingAPI.Framework 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() diff --git a/src/SMAPI/Patches/ObjectErrorPatch.cs b/src/SMAPI/Patches/ObjectErrorPatch.cs index 2cbb60c5..0481259d 100644 --- a/src/SMAPI/Patches/ObjectErrorPatch.cs +++ b/src/SMAPI/Patches/ObjectErrorPatch.cs @@ -49,7 +49,7 @@ namespace StardewModdingAPI.Patches return false; } - return false; + return true; } } } |