From 52cf1e18590fbef3e2f221e19a2dc126af2f4ad5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Apr 2020 16:48:17 +0900
Subject: [PATCH] Fix hit type not being provided and hit time offset not being
 considered

---
 .../Objects/Drawables/DrawableFlyingHit.cs      | 17 +++++++++++------
 .../UI/DrumRollHitContainer.cs                  |  2 +-
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs    |  9 ++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs
index 86822e3ae8..460e760629 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs
@@ -11,16 +11,21 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     /// </summary>
     public class DrawableFlyingHit : DrawableHit
     {
+        public DrawableFlyingHit(DrawableDrumRollTick drumRollTick)
+            : base(new IgnoreHit
+            {
+                StartTime = drumRollTick.HitObject.StartTime + drumRollTick.Result.TimeOffset,
+                IsStrong = drumRollTick.HitObject.IsStrong,
+                Type = drumRollTick.JudgementType
+            })
+        {
+            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
             ApplyResult(r => r.Type = r.Judgement.MaxResult);
         }
-
-        public DrawableFlyingHit(double time, bool isStrong = false)
-            : base(new IgnoreHit { StartTime = time, IsStrong = isStrong })
-        {
-            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs b/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs
index 9ef944b412..fde42bec04 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrumRollHitContainer.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             for (var i = AliveInternalChildren.Count - 1; i >= 0; i--)
             {
                 var flyingHit = (DrawableFlyingHit)AliveInternalChildren[i];
-                if (Time.Current < flyingHit.HitObject.StartTime)
+                if (Time.Current <= flyingHit.HitObject.StartTime)
                     Remove(flyingHit);
             }
         }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 28706ef0d3..4bc6cb8e4b 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -9,7 +9,6 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
@@ -206,12 +205,8 @@ namespace osu.Game.Rulesets.Taiko.UI
             }
         }
 
-        private void addDrumRollHit(DrawableDrumRollTick drawableTick)
-        {
-            bool isStrong = drawableTick.HitObject.IsStrong;
-            double time = drawableTick.HitObject.GetEndTime();
-            drumRollHitContainer.Add(new DrawableFlyingHit(time, isStrong));
-        }
+        private void addDrumRollHit(DrawableDrumRollTick drawableTick) =>
+            drumRollHitContainer.Add(new DrawableFlyingHit(drawableTick));
 
         private void addExplosion(DrawableHitObject drawableObject, HitType type)
         {