diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-02-22 23:03:26 -0500 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-02-22 23:03:26 -0500 |
| commit | 5ae640dc91adff8dfb0827e2a3c3f6b54be7c612 (patch) | |
| tree | fc1c82e1d85fc8e7b094eeb2c14f7b6a41aea9be /src/SMAPI | |
| parent | f98f61e6d891c43adae4494b84705dee369829f7 (diff) | |
| parent | d03f77dd3516f70411be7b61d9a8aa81a7b228a5 (diff) | |
| download | SMAPI-5ae640dc91adff8dfb0827e2a3c3f6b54be7c612.tar.gz SMAPI-5ae640dc91adff8dfb0827e2a3c3f6b54be7c612.tar.bz2 SMAPI-5ae640dc91adff8dfb0827e2a3c3f6b54be7c612.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 | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs index e71b21b1..3242a12c 100644 --- a/src/SMAPI/Constants.cs +++ b/src/SMAPI/Constants.cs @@ -20,7 +20,7 @@ namespace StardewModdingAPI ** Public ****/ /// <summary>SMAPI's current semantic version.</summary> - public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.3.1"); + public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.3.2"); /// <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/SGame.cs b/src/SMAPI/Framework/SGame.cs index 6b9c1365..b2d92ce8 100644 --- a/src/SMAPI/Framework/SGame.cs +++ b/src/SMAPI/Framework/SGame.cs @@ -226,8 +226,12 @@ namespace StardewModdingAPI.Framework /// <param name="message">The message to deliver to applicable mods.</param> private void OnModMessageReceived(ModMessageModel message) { - // raise events for applicable mods + // get mod IDs to notify HashSet<string> modIDs = new HashSet<string>(message.ToModIDs ?? this.ModRegistry.GetAll().Select(p => p.Manifest.UniqueID), StringComparer.InvariantCultureIgnoreCase); + if (message.FromPlayerID == Game1.player?.UniqueMultiplayerID) + modIDs.Remove(message.FromModID); // don't send a broadcast back to the sender + + // raise events this.Events.ModMessageReceived.RaiseForMods(new ModMessageReceivedEventArgs(message), mod => mod != null && modIDs.Contains(mod.Manifest.UniqueID)); } |