From ee8804b50b86e6d2bb85c18908f715fec0b599f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 17:53:27 +0900
Subject: [PATCH] Fix animation playback not running on skin change

---
 .../Rulesets/Judgements/DrawableJudgement.cs  | 39 ++++++++++++++++---
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index c0fcb1eb3c..85875e2f2a 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -28,8 +28,13 @@ namespace osu.Game.Rulesets.Judgements
 
         protected Container JudgementBody { get; private set; }
 
+        public override bool RemoveCompletedTransforms => false;
+
         private SkinnableDrawable skinnableJudgement;
 
+        [Resolved]
+        private ISkinSource skinSource { get; set; }
+
         /// <summary>
         /// Duration of initial fade in.
         /// </summary>
@@ -65,6 +70,27 @@ namespace osu.Game.Rulesets.Judgements
             prepareDrawables();
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            skinSource.SourceChanged += onSkinChanged;
+        }
+
+        private void onSkinChanged()
+        {
+            // on a skin change, the child component will update but not get correctly triggered to play its animation.
+            // we need to trigger a reinitialisation to make things right.
+            currentDrawableType = null;
+
+            PrepareForUse();
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            skinSource.SourceChanged -= onSkinChanged;
+        }
+
         /// <summary>
         /// Apply top-level animations to the current judgement when successfully hit.
         /// Generally used for fading, defaulting to a simple fade out based on <see cref="FadeOutDelay"/>.
@@ -110,6 +136,12 @@ namespace osu.Game.Rulesets.Judgements
 
             prepareDrawables();
 
+            runAnimation();
+        }
+
+        private void runAnimation()
+        {
+            ClearTransforms(true);
             LifetimeStart = Result.TimeAbsolute;
 
             using (BeginAbsoluteSequence(Result.TimeAbsolute, true))
@@ -135,18 +167,13 @@ namespace osu.Game.Rulesets.Judgements
                 {
                     var drawableAnimation = (Drawable)animatable;
 
-                    drawableAnimation.ClearTransforms();
-
                     animatable.PlayAnimation();
 
-                    // a derived version of DrawableJudgement may be adjusting lifetime.
+                    // a derived version of DrawableJudgement may be proposing a lifetime.
                     // if not adjusted (or the skinned portion requires greater bounds than calculated) use the skinned source's lifetime.
                     double lastTransformTime = drawableAnimation.LatestTransformEndTime;
-
                     if (LifetimeEnd == double.MaxValue || lastTransformTime > LifetimeEnd)
-                    {
                         LifetimeEnd = lastTransformTime;
-                    }
                 }
             }
         }