From 27f5a99726c238effb4311e0324dc589f30a1d08 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 20 Nov 2020 18:42:48 +0900
Subject: [PATCH] Fix more than one proxy is created

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs | 37 +++++++++---------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 1b0d50b4f3..d453b9cd53 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -96,10 +96,20 @@ namespace osu.Game.Rulesets.Osu.UI
 
         private void onDrawableHitObjectAdded(DrawableHitObject drawable)
         {
-            if (!drawable.IsLoaded)
-                drawable.OnLoadComplete += onDrawableHitObjectLoaded;
-
             ((DrawableOsuHitObject)drawable).CheckHittable = CheckHittable;
+
+            switch (drawable)
+            {
+                case DrawableSpinner _:
+                    if (!drawable.HasProxy)
+                        spinnerProxies.Add(drawable.CreateProxy());
+                    break;
+
+                case IDrawableHitObjectWithProxiedApproach approach:
+                    if (!approach.ProxiedLayer.HasProxy)
+                        approachCircles.Add(approach.ProxiedLayer.CreateProxy());
+                    break;
+            }
         }
 
         [BackgroundDependencyLoader(true)]
@@ -134,27 +144,6 @@ namespace osu.Game.Rulesets.Osu.UI
             followPoints.RemoveFollowPoints((OsuHitObject)hitObject);
         }
 
-        private void onDrawableHitObjectLoaded(Drawable drawable)
-        {
-            switch (drawable)
-            {
-                case DrawableSliderHead _:
-                case DrawableSliderTail _:
-                case DrawableSliderTick _:
-                case DrawableSliderRepeat _:
-                case DrawableSpinnerTick _:
-                    break;
-
-                case DrawableSpinner _:
-                    spinnerProxies.Add(drawable.CreateProxy());
-                    break;
-
-                case IDrawableHitObjectWithProxiedApproach approach:
-                    approachCircles.Add(approach.ProxiedLayer.CreateProxy());
-                    break;
-            }
-        }
-
         private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
             // Hitobjects that block future hits should miss previous hitobjects if they're hit out-of-order.