From e518508f2d0e86a28dd466e01fcf08b0e49b811b Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Wed, 29 Mar 2017 09:11:07 +0900
Subject: [PATCH] Better life time ends.

---
 osu.Game.Modes.Taiko/Objects/Drawable/DrawableHit.cs     | 9 +++++----
 .../Objects/Drawable/DrawableTaikoHitObject.cs           | 1 -
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableHit.cs b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableHit.cs
index 56e2f329bf..504e3c7c19 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableHit.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableHit.cs
@@ -83,16 +83,17 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
                 case ArmedState.Idle:
                     break;
                 case ArmedState.Miss:
-                    bodyContainer.FadeOut(100);
+                    FadeOut(100);
+                    Expire();
                     break;
                 case ArmedState.Hit:
                     bodyContainer.ScaleTo(0.8f, 400, EasingTypes.OutQuad);
-                    bodyContainer.FadeOut(600, EasingTypes.OutQuint);
                     bodyContainer.MoveToY(-200, 250, EasingTypes.Out);
-
                     bodyContainer.Delay(250);
-
                     bodyContainer.MoveToY(0, 500, EasingTypes.In);
+
+                    FadeOut(600);
+                    Expire();
                     break;
             }
         }
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
index c14dc6d7b0..5d6d669dc1 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
@@ -30,7 +30,6 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
         protected override void LoadComplete()
         {
             LifetimeStart = HitObject.StartTime - HitObject.PreEmpt * 2;
-            LifetimeEnd = HitObject.StartTime + HitObject.PreEmpt;
 
             base.LoadComplete();
         }