From ca13b2834c3d34be94c4d46a59cba945e62cce33 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 26 Nov 2017 15:39:41 -0500
Subject: fix e.SuppressButton() not working with some mouse buttons, update
 release notes (#389)

---
 docs/release-notes.md              |  2 ++
 src/SMAPI/Events/EventArgsInput.cs | 31 +++++++++----------------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/docs/release-notes.md b/docs/release-notes.md
index a74b1927..433050fb 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -5,6 +5,8 @@
 
 * For modders:
   * Added `DaysSinceStart` property to `SDate` dates.
+  * Fixed input `e.SuppressButton(button)` method ignoring input.
+  * Fixed input `e.SuppressButton()` method not working with mouse buttons.
 
 ## 2.1
 * For players:
diff --git a/src/SMAPI/Events/EventArgsInput.cs b/src/SMAPI/Events/EventArgsInput.cs
index 276bfef6..54ce9b53 100644
--- a/src/SMAPI/Events/EventArgsInput.cs
+++ b/src/SMAPI/Events/EventArgsInput.cs
@@ -129,30 +129,17 @@ namespace StardewModdingAPI.Events
             }
 
             // mouse
-            else if (button == SButton.MouseLeft)
+            else if (button == SButton.MouseLeft || button == SButton.MouseMiddle || button == SButton.MouseRight || button == SButton.MouseX1 || button == SButton.MouseX2)
             {
                 Game1.oldMouseState = new MouseState(
-                    Game1.oldMouseState.X,
-                    Game1.oldMouseState.Y,
-                    Game1.oldMouseState.ScrollWheelValue,
-                    ButtonState.Pressed,
-                    Game1.oldMouseState.MiddleButton,
-                    Game1.oldMouseState.RightButton,
-                    Game1.oldMouseState.XButton1,
-                    Game1.oldMouseState.XButton2
-                );
-            }
-            else if (button == SButton.MouseRight)
-            {
-                Game1.oldMouseState = new MouseState(
-                    Game1.oldMouseState.X,
-                    Game1.oldMouseState.Y,
-                    Game1.oldMouseState.ScrollWheelValue,
-                    Game1.oldMouseState.LeftButton,
-                    Game1.oldMouseState.MiddleButton,
-                    ButtonState.Pressed,
-                    Game1.oldMouseState.XButton1,
-                    Game1.oldMouseState.XButton2
+                    x: Game1.oldMouseState.X,
+                    y: Game1.oldMouseState.Y,
+                    scrollWheel: Game1.oldMouseState.ScrollWheelValue,
+                    leftButton: button == SButton.MouseLeft ? ButtonState.Pressed : Game1.oldMouseState.LeftButton,
+                    middleButton: button == SButton.MouseMiddle ? ButtonState.Pressed : Game1.oldMouseState.MiddleButton,
+                    rightButton: button == SButton.MouseRight ? ButtonState.Pressed : Game1.oldMouseState.RightButton,
+                    xButton1: button == SButton.MouseX1 ? ButtonState.Pressed : Game1.oldMouseState.XButton1,
+                    xButton2: button == SButton.MouseX2 ? ButtonState.Pressed : Game1.oldMouseState.XButton2
                 );
             }
         }
-- 
cgit