From 93915ba5270629dba09a0ff88b24fbb0cb5ca075 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Mar 2017 18:56:22 +0900
Subject: [PATCH] Fix regression of osu! judgement animation.

---
 .../Objects/Drawables/DrawableOsuJudgementInfo.cs          | 7 +------
 osu.Game/Modes/Judgements/DrawableJudgementInfo.cs         | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuJudgementInfo.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuJudgementInfo.cs
index 15832bcb75..9cc09ff8d6 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuJudgementInfo.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuJudgementInfo.cs
@@ -17,15 +17,10 @@ public DrawableOsuJudgementInfo(OsuJudgementInfo judgement) : base(judgement)
 
         protected override void LoadComplete()
         {
-            base.LoadComplete();
-
             if (Judgement.Result != HitResult.Miss)
-            {
                 JudgementText.TransformSpacingTo(new Vector2(14, 0), 1800, EasingTypes.OutQuint);
-                FadeOut(500);
-            }
 
-            Expire();
+            base.LoadComplete();
         }
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Modes/Judgements/DrawableJudgementInfo.cs b/osu.Game/Modes/Judgements/DrawableJudgementInfo.cs
index 85b357a995..ae51287599 100644
--- a/osu.Game/Modes/Judgements/DrawableJudgementInfo.cs
+++ b/osu.Game/Modes/Judgements/DrawableJudgementInfo.cs
@@ -83,8 +83,8 @@ protected override void LoadComplete()
                     ScaleTo(0.9f);
                     ScaleTo(1, 500, EasingTypes.OutElastic);
 
-                    Delay(250);
-                    FadeOut(250, EasingTypes.OutQuint);
+                    Delay(100);
+                    FadeOut(400);
                     break;
             }