From 446a9c1b05d5c98e89d85c699afa82338f9f7810 Mon Sep 17 00:00:00 2001
From: sw1tchbl4d3 <sw1tchbl4d3@sw1tchbl4d3.com>
Date: Thu, 27 Oct 2022 23:41:17 +0200
Subject: [PATCH] Make added effect points inherit previous effect point
 settings

---
 .../Beatmaps/TaikoBeatmapConverter.cs           | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index c1e1052569..3cc47deed0 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -65,17 +65,16 @@ protected override Beatmap<TaikoHitObject> ConvertBeatmap(IBeatmap original, Can
                 foreach (HitObject hitObject in original.HitObjects)
                 {
                     double nextScrollSpeed = hitObject.DifficultyControlPoint.SliderVelocity;
+                    EffectControlPoint currentEffectPoint = converted.ControlPointInfo.EffectPointAt(hitObject.StartTime);
 
-                    if (!Precision.AlmostEquals(lastScrollSpeed, nextScrollSpeed))
+                    if (!Precision.AlmostEquals(lastScrollSpeed, nextScrollSpeed, acceptableDifference: currentEffectPoint.ScrollSpeedBindable.Precision))
                     {
-                        EffectControlPoint currentControlPoint = converted.ControlPointInfo.EffectPointAt(hitObject.StartTime);
-
-                        if (Precision.AlmostEquals(currentControlPoint.Time, hitObject.StartTime))
-                            currentControlPoint.ScrollSpeed = nextScrollSpeed;
-                        else
-                            converted.ControlPointInfo.Add(hitObject.StartTime, new EffectControlPoint { ScrollSpeed = nextScrollSpeed });
-
-                        lastScrollSpeed = nextScrollSpeed;
+                        converted.ControlPointInfo.Add(hitObject.StartTime, new EffectControlPoint
+                        {
+                            KiaiMode = currentEffectPoint.KiaiMode,
+                            OmitFirstBarLine = currentEffectPoint.OmitFirstBarLine,
+                            ScrollSpeed = lastScrollSpeed = nextScrollSpeed,
+                        });
                     }
                 }
             }