From d6a49b9e93eecd41c6c6e4fc91b599b93050b6bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Oct 2019 10:25:13 +0900
Subject: [PATCH] Add back autogeneration rules

Will be removed in https://github.com/ppy/osu/pull/6604
---
 .../Beatmaps/ControlPoints/ControlPointGroup.cs     | 13 +++++++++++--
 osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs |  3 ---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs   | 12 +++++-------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointGroup.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointGroup.cs
index c4b990675e..8b71fc1897 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointGroup.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointGroup.cs
@@ -30,10 +30,19 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public void Add(ControlPoint point)
         {
-            point.AttachGroup(this);
+            var existing = controlPoints.FirstOrDefault(p => p.GetType() == point.GetType());
+
+            if (existing != null)
+            {
+                // autogenerated points should not replace non-autogenerated.
+                // this allows for incorrectly ordered timing points to still be correctly handled.
+                if (point.AutoGenerated && !existing.AutoGenerated)
+                    return;
 
-            foreach (var existing in controlPoints.Where(p => p.GetType() == point.GetType()).ToArray())
                 Remove(existing);
+            }
+
+            point.AttachGroup(this);
 
             controlPoints.Add(point);
             ItemAdded?.Invoke(point);
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index 0122ee5cdc..d6db4c8d10 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -184,9 +184,6 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public void Add(double time, ControlPoint newPoint, bool force = false)
         {
-            if (!force && SimilarPointAt(time, newPoint)?.EquivalentTo(newPoint) == true)
-                return;
-
             GroupAt(time, true).Add(newPoint);
         }
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index b5f763fc8d..24422199e5 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -374,14 +374,12 @@ namespace osu.Game.Beatmaps.Formats
 
                 beatmap.ControlPointInfo.Add(time, controlPoint);
             }
-            else
+
+            beatmap.ControlPointInfo.Add(time, new DifficultyControlPoint
             {
-                beatmap.ControlPointInfo.Add(time, new DifficultyControlPoint
-                {
-                    SpeedMultiplier = speedMultiplier,
-                    AutoGenerated = false
-                });
-            }
+                SpeedMultiplier = speedMultiplier,
+                AutoGenerated = timingChange
+            });
 
             beatmap.ControlPointInfo.Add(time, new EffectControlPoint
             {