From 89bea2868a9ca68a8c09a9c93db6f504e9022a96 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 14:33:55 +0900
Subject: [PATCH] Move bool one level down

---
 osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs | 2 +-
 osu.Game.Rulesets.Catch/UI/Catcher.cs          | 9 +++++++--
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs      | 7 +------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
index 5c5e41234d..bba42dea97 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
@@ -25,7 +25,7 @@ public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRules
             var drawableCatchRuleset = (DrawableCatchRuleset)drawableRuleset;
             var catchPlayfield = (CatchPlayfield)drawableCatchRuleset.Playfield;
 
-            catchPlayfield.CatcherArea.CatchFruitOnPlate = false;
+            catchPlayfield.CatcherArea.MovableCatcher.CatchFruitOnPlate = false;
         }
 
         protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 42be745c2e..5d57e84b75 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -43,6 +43,11 @@ public class Catcher : SkinReloadableDrawable, IKeyBindingHandler<CatchAction>
         /// </summary>
         public bool HyperDashing => hyperDashModifier != 1;
 
+        /// <summary>
+        /// Whether <see cref="DrawablePalpableCatchHitObject"/> fruit should appear on the plate.
+        /// </summary>
+        public bool CatchFruitOnPlate { get; set; } = true;
+
         /// <summary>
         /// The relative space to cover in 1 millisecond. based on 1 game pixel per millisecond as in osu-stable.
         /// </summary>
@@ -223,7 +228,7 @@ public bool CanCatch(CatchHitObject hitObject)
                    catchObjectPosition <= catcherPosition + halfCatchWidth;
         }
 
-        public void OnNewResult(DrawableCatchHitObject drawableObject, JudgementResult result, bool placeOnPlate)
+        public void OnNewResult(DrawableCatchHitObject drawableObject, JudgementResult result)
         {
             var catchResult = (CatchJudgementResult)result;
             catchResult.CatcherAnimationState = CurrentState;
@@ -237,7 +242,7 @@ public void OnNewResult(DrawableCatchHitObject drawableObject, JudgementResult r
             {
                 var positionInStack = computePositionInStack(new Vector2(palpableObject.X - X, 0), palpableObject.DisplaySize.X / 2);
 
-                if (placeOnPlate)
+                if (CatchFruitOnPlate)
                     placeCaughtObject(palpableObject, positionInStack);
 
                 if (hitLighting.Value)
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 29c95ec61c..44adbd5512 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -21,11 +21,6 @@ public class CatcherArea : Container
         public readonly Catcher MovableCatcher;
         private readonly CatchComboDisplay comboDisplay;
 
-        /// <summary>
-        /// Whether <see cref="DrawablePalpableCatchHitObject"/> fruit should appear on the plate.
-        /// </summary>
-        public bool CatchFruitOnPlate { get; set; } = true;
-
         public CatcherArea(Container<CaughtObject> droppedObjectContainer, BeatmapDifficulty difficulty = null)
         {
             Size = new Vector2(CatchPlayfield.WIDTH, CATCHER_SIZE);
@@ -46,7 +41,7 @@ public CatcherArea(Container<CaughtObject> droppedObjectContainer, BeatmapDiffic
 
         public void OnNewResult(DrawableCatchHitObject hitObject, JudgementResult result)
         {
-            MovableCatcher.OnNewResult(hitObject, result, CatchFruitOnPlate);
+            MovableCatcher.OnNewResult(hitObject, result);
 
             if (!result.Type.IsScorable())
                 return;