From 05aaa377e74078c0e4aa3f591066a0e3644e4e51 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 19:02:49 +0900
Subject: [PATCH] Don't use CreateDrawableRepresentation in CatcherArea

---
 .../TestSceneCatcherArea.cs                     |  1 -
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs    |  1 -
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs       | 17 +++++++++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index e055f08dc2..2d46cbdbbd 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -103,7 +103,6 @@ namespace osu.Game.Rulesets.Catch.Tests
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.TopCentre,
-                    CreateDrawableRepresentation = ((DrawableRuleset<CatchHitObject>)catchRuleset.CreateInstance().CreateDrawableRulesetWith(new CatchBeatmap())).CreateDrawableRepresentation
                 },
             });
         }
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 9df32d8d36..bab8356ac4 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -42,7 +42,6 @@ namespace osu.Game.Rulesets.Catch.UI
 
             CatcherArea = new CatcherArea(difficulty)
             {
-                CreateDrawableRepresentation = createDrawableRepresentation,
                 ExplodingFruitTarget = explodingFruitContainer,
                 Anchor = Anchor.BottomLeft,
                 Origin = Anchor.TopLeft,
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index ad79a23279..085af79689 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -10,7 +10,6 @@ using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osuTK;
@@ -21,8 +20,6 @@ namespace osu.Game.Rulesets.Catch.UI
     {
         public const float CATCHER_SIZE = 106.75f;
 
-        public Func<CatchHitObject, DrawableHitObject<CatchHitObject>> CreateDrawableRepresentation;
-
         public readonly Catcher MovableCatcher;
         private readonly CatchComboDisplay comboDisplay;
 
@@ -72,7 +69,7 @@ namespace osu.Game.Rulesets.Catch.UI
             if (result.IsHit && hitObject is DrawablePalpableCatchHitObject fruit)
             {
                 // create a new (cloned) fruit to stay on the plate. the original is faded out immediately.
-                var caughtFruit = (DrawableCatchHitObject)CreateDrawableRepresentation?.Invoke(fruit.HitObject);
+                var caughtFruit = createCaughtFruit(fruit);
 
                 if (caughtFruit == null) return;
 
@@ -127,5 +124,17 @@ namespace osu.Game.Rulesets.Catch.UI
 
             comboDisplay.X = MovableCatcher.X;
         }
+
+        private DrawableCatchHitObject createCaughtFruit(DrawablePalpableCatchHitObject hitObject)
+        {
+            return hitObject.HitObject switch
+            {
+                Banana banana => new DrawableBanana(banana),
+                Fruit fruit => new DrawableFruit(fruit),
+                TinyDroplet tiny => new DrawableTinyDroplet(tiny),
+                Droplet droplet => new DrawableDroplet(droplet),
+                _ => null
+            };
+        }
     }
 }