From 994db55b6d542c187d96d6905552f79d2a352d6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 02:19:43 +0900
Subject: [PATCH] Simplify check conditionals

---
 osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index ce1fa963e7..27f7886d79 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -27,15 +27,9 @@ public class DrawableCatchRuleset : DrawableScrollingRuleset<CatchHitObject>
 
         protected override bool UserScrollSpeedAdjustment => false;
 
-        private readonly bool showMobileMapper = true;
-
         public DrawableCatchRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
             : base(ruleset, beatmap, mods)
         {
-            // Check if mods have RelaxMod instance
-            if (mods != null && mods.OfType<ModRelax>().Any())
-                showMobileMapper = false;
-
             Direction.Value = ScrollingDirection.Down;
             TimeRange.Value = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450);
         }
@@ -43,7 +37,8 @@ public DrawableCatchRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (showMobileMapper)
+            // With relax mod, input maps directly to x position and left/right buttons are not used.
+            if (!Mods.Any(m => m is ModRelax))
                 KeyBindingInputManager.Add(new CatchTouchInputMapper());
         }