Merge branch 'develop' into stable

2 files changed, 17 insertions, 23 deletions

diff --git a/src/SMAPI/Framework/Input/GamePadStateBuilder.cs b/src/SMAPI/Framework/Input/GamePadStateBuilder.cs
index 36622066..2657fd12 100644
--- a/src/SMAPI/Framework/Input/GamePadStateBuilder.cs
+++ b/src/SMAPI/Framework/Input/GamePadStateBuilder.cs
@@ -205,16 +205,13 @@ namespace StardewModdingAPI.Framework.Input
         /// <summary>Get the equivalent state.</summary>
         public GamePadState GetState()
         {
-            if (this.State == null)
-            {
-                this.State = new GamePadState(
-                    leftThumbStick: this.LeftStickPos,
-                    rightThumbStick: this.RightStickPos,
-                    leftTrigger: this.LeftTrigger,
-                    rightTrigger: this.RightTrigger,
-                    buttons: this.GetButtonBitmask() // MonoGame requires one bitmask here; don't specify multiple values
-                );
-            }
+            this.State ??= new GamePadState(
+                leftThumbStick: this.LeftStickPos,
+                rightThumbStick: this.RightStickPos,
+                leftTrigger: this.LeftTrigger,
+                rightTrigger: this.RightTrigger,
+                buttons: this.GetButtonBitmask() // MonoGame requires one bitmask here; don't specify multiple values
+            );
 
             return this.State.Value;
         }
diff --git a/src/SMAPI/Framework/Input/MouseStateBuilder.cs b/src/SMAPI/Framework/Input/MouseStateBuilder.cs
index 59956feb..1cc16ca9 100644
--- a/src/SMAPI/Framework/Input/MouseStateBuilder.cs
+++ b/src/SMAPI/Framework/Input/MouseStateBuilder.cs
@@ -89,19 +89,16 @@ namespace StardewModdingAPI.Framework.Input
         /// <summary>Get the equivalent state.</summary>
         public MouseState GetState()
         {
-            if (this.State == null)
-            {
-                this.State = new MouseState(
-                    x: this.X,
-                    y: this.Y,
-                    scrollWheel: this.ScrollWheelValue,
-                    leftButton: this.ButtonStates[SButton.MouseLeft],
-                    middleButton: this.ButtonStates[SButton.MouseMiddle],
-                    rightButton: this.ButtonStates[SButton.MouseRight],
-                    xButton1: this.ButtonStates[SButton.MouseX1],
-                    xButton2: this.ButtonStates[SButton.MouseX2]
-                );
-            }
+            this.State ??= new MouseState(
+                x: this.X,
+                y: this.Y,
+                scrollWheel: this.ScrollWheelValue,
+                leftButton: this.ButtonStates[SButton.MouseLeft],
+                middleButton: this.ButtonStates[SButton.MouseMiddle],
+                rightButton: this.ButtonStates[SButton.MouseRight],
+                xButton1: this.ButtonStates[SButton.MouseX1],
+                xButton2: this.ButtonStates[SButton.MouseX2]
+            );
 
             return this.State.Value;
         }