StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix players in split-screen mode sharing peer state (#747)

This commit is contained in:
Jesse Plamondon-Willard 2021-01-02 12:33:19 -05:00
parent 0fdb09f5f9
commit 251ee2121a
No known key found for this signature in database
GPG Key ID: CF8B1456B3E29F49
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes.md
View File

@ -10,6 +10,7 @@
## Upcoming release ## Upcoming release
* For players: * For players:
* Updated compatibility list. * Updated compatibility list.
* Fixed errors when multiple players join in split-screen mode.
* Fixed 'skipped mods' section repeating mods in some cases. * Fixed 'skipped mods' section repeating mods in some cases.
* For modders: * For modders:

15
src/SMAPI/Framework/SMultiplayer.cs
View File

@ -10,6 +10,7 @@ using StardewModdingAPI.Framework.Events;
using StardewModdingAPI.Framework.Networking; using StardewModdingAPI.Framework.Networking;
using StardewModdingAPI.Framework.Reflection; using StardewModdingAPI.Framework.Reflection;
using StardewModdingAPI.Toolkit.Serialization; using StardewModdingAPI.Toolkit.Serialization;
using StardewModdingAPI.Utilities;
using StardewValley; using StardewValley;
using StardewValley.Network; using StardewValley.Network;
using StardewValley.SDKs; using StardewValley.SDKs;
@ -54,15 +55,25 @@ namespace StardewModdingAPI.Framework
/// <summary>Whether to log network traffic.</summary> /// <summary>Whether to log network traffic.</summary>
private readonly bool LogNetworkTraffic; private readonly bool LogNetworkTraffic;
/// <summary>The backing field for <see cref="Peers"/>.</summary>
private readonly PerScreen<IDictionary<long, MultiplayerPeer>> PeersImpl = new(() => new Dictionary<long, MultiplayerPeer>());
/// <summary>The backing field for <see cref="HostPeer"/>.</summary>
private readonly PerScreen<MultiplayerPeer> HostPeerImpl = new();
/********* /*********
** Accessors ** Accessors
*********/ *********/
/// <summary>The metadata for each connected peer.</summary> /// <summary>The metadata for each connected peer.</summary>
public IDictionary<long, MultiplayerPeer> Peers { get; } = new Dictionary<long, MultiplayerPeer>(); public IDictionary<long, MultiplayerPeer> Peers => this.PeersImpl.Value;
/// <summary>The metadata for the host player, if the current player is a farmhand.</summary> /// <summary>The metadata for the host player, if the current player is a farmhand.</summary>
public MultiplayerPeer HostPeer; public MultiplayerPeer HostPeer
{
get => this.HostPeerImpl.Value;
private set => this.HostPeerImpl.Value = value;
}
/********* /*********