From 47855de6ab69536bce3fde959db249283acbe069 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Dec 2022 16:54:58 +0900
Subject: [PATCH] Fix multiple issues with transform handling

---
 .../Skinning/Legacy/LegacyKiaiGlow.cs         | 33 ++++++++-----------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyKiaiGlow.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyKiaiGlow.cs
index 80b8bc9b11..d06571eba2 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyKiaiGlow.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyKiaiGlow.cs
@@ -16,15 +16,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     internal partial class LegacyKiaiGlow : BeatSyncedContainer
     {
-        public LegacyKiaiGlow()
-        {
-            AlwaysPresent = true;
-            Alpha = 0;
-        }
+        private bool isKiaiActive;
 
-        [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
+        [BackgroundDependencyLoader(true)]
+        private void load(ISkinSource skin, HealthProcessor? healthProcessor)
         {
+            Alpha = 0;
+
             Child = new Sprite
             {
                 Texture = skin.GetTexture("taiko-glow"),
@@ -33,14 +31,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                 Scale = new Vector2(0.7f),
                 Colour = new Colour4(255, 228, 0, 255),
             };
-        }
-
-        [Resolved(CanBeNull = true)]
-        private HealthProcessor? healthProcessor { get; set; }
-
-        protected override void Update()
-        {
-            base.Update();
 
             if (healthProcessor != null)
                 healthProcessor.NewJudgement += onNewJudgement;
@@ -48,16 +38,21 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 
         private void onNewJudgement(JudgementResult result)
         {
-            if (!result.IsHit)
+            if (!result.IsHit || !isKiaiActive)
                 return;
 
-            this.ScaleTo(1.2f)
-                .Then().ScaleTo(1f, 80, Easing.OutQuad);
+            this.ScaleTo(1.2f).Then()
+                .ScaleTo(1f, 80, Easing.OutQuad);
         }
 
         protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
-            if (effectPoint.KiaiMode)
+            if (effectPoint.KiaiMode == isKiaiActive)
+                return;
+
+            isKiaiActive = effectPoint.KiaiMode;
+
+            if (isKiaiActive)
                 this.FadeIn(180);
             else
                 this.FadeOut(180);