From 4406f441654726dd21c810349b0eeb6935ba7d65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Mar 2020 17:26:35 +0900
Subject: [PATCH] Remove osu!catch GotoFrame usage

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs     | 5 ++++-
 osu.Game/Skinning/LegacySkinExtensions.cs | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index e361b29a9d..bc0311bd2d 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Timing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
@@ -379,7 +380,9 @@ namespace osu.Game.Rulesets.Catch.UI
             }
 
             currentCatcher.Show();
-            (currentCatcher.Drawable as IAnimation)?.GotoFrame(0);
+
+            if (currentCatcher.Drawable.Clock is FramedOffsetClock offsetClock)
+                offsetClock.Offset = -Time.Current;
         }
 
         private void beginTrail()
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 8765b161d4..de0add6ba3 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -71,6 +71,8 @@ namespace osu.Game.Skinning
 
                 if (timeReference != null)
                     Clock = new FramedOffsetClock(timeReference.Clock) { Offset = -timeReference.AnimationStartTime };
+                else
+                    Clock = new FramedOffsetClock(Clock);
             }
         }