From 66a474619ce2f56d127d92c2c0ca2429f845ab10 Mon Sep 17 00:00:00 2001
From: Alchyr <isithalchyr@gmail.com>
Date: Tue, 7 Apr 2020 18:13:26 -0700
Subject: [PATCH 1/6] Adjust TimingControlPoint equivalency

---
 osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index 51b3377394..158788964b 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -50,6 +50,6 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public override bool EquivalentTo(ControlPoint other) =>
             other is TimingControlPoint otherTyped
-            && TimeSignature == otherTyped.TimeSignature && BeatLength.Equals(otherTyped.BeatLength);
+            && Time == otherTyped.Time && TimeSignature == otherTyped.TimeSignature && BeatLength.Equals(otherTyped.BeatLength);
     }
 }

From 65823fb2e1101f4b73bc7446063520ca95bbf846 Mon Sep 17 00:00:00 2001
From: Alchyr <isithalchyr@gmail.com>
Date: Wed, 8 Apr 2020 01:42:35 -0700
Subject: [PATCH 2/6] Use redundancy test

---
 .../NonVisual/ControlPointInfoTest.cs         | 23 ++++++++++++-------
 .../Beatmaps/ControlPoints/ControlPoint.cs    |  8 +++++++
 .../ControlPoints/ControlPointInfo.cs         |  2 +-
 .../ControlPoints/DifficultyControlPoint.cs   |  1 +
 .../ControlPoints/EffectControlPoint.cs       |  1 +
 .../ControlPoints/SampleControlPoint.cs       |  1 +
 .../ControlPoints/TimingControlPoint.cs       |  6 ++++-
 7 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs b/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
index 2782e902fe..158954106d 100644
--- a/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
+++ b/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
@@ -29,11 +29,17 @@ namespace osu.Game.Tests.NonVisual
             var cpi = new ControlPointInfo();
 
             cpi.Add(0, new TimingControlPoint()); // is *not* redundant, special exception for first timing point.
-            cpi.Add(1000, new TimingControlPoint()); // is redundant
+            cpi.Add(1000, new TimingControlPoint()); // is also not redundant, due to change of offset
 
-            Assert.That(cpi.Groups.Count, Is.EqualTo(1));
-            Assert.That(cpi.TimingPoints.Count, Is.EqualTo(1));
-            Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(1));
+            Assert.That(cpi.Groups.Count, Is.EqualTo(2));
+            Assert.That(cpi.TimingPoints.Count, Is.EqualTo(2));
+            Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(2));
+
+            cpi.Add(1000, new TimingControlPoint()); //is redundant
+
+            Assert.That(cpi.Groups.Count, Is.EqualTo(2));
+            Assert.That(cpi.TimingPoints.Count, Is.EqualTo(2));
+            Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(2));
         }
 
         [Test]
@@ -86,11 +92,12 @@ namespace osu.Game.Tests.NonVisual
             Assert.That(cpi.EffectPoints.Count, Is.EqualTo(0));
             Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(0));
 
-            cpi.Add(1000, new EffectControlPoint { KiaiMode = true }); // is not redundant
+            cpi.Add(1000, new EffectControlPoint { KiaiMode = true, OmitFirstBarLine = true }); // is not redundant
+            cpi.Add(1400, new EffectControlPoint { KiaiMode = true, OmitFirstBarLine = true }); // same settings, but is not redundant
 
-            Assert.That(cpi.Groups.Count, Is.EqualTo(1));
-            Assert.That(cpi.EffectPoints.Count, Is.EqualTo(1));
-            Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(1));
+            Assert.That(cpi.Groups.Count, Is.EqualTo(2));
+            Assert.That(cpi.EffectPoints.Count, Is.EqualTo(2));
+            Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(2));
         }
 
         [Test]
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
index 39a0e6f6d4..411a4441de 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
@@ -25,6 +25,14 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <returns>Whether equivalent.</returns>
         public abstract bool EquivalentTo(ControlPoint other);
 
+        /// <summary>
+        /// Whether this control point results in a meaningful change when placed after another.
+        /// </summary>
+        /// <param name="other">Another control point to compare with.</param>
+        /// <param name="time">The time this timing point will be placed at.</param>
+        /// <returns>Whether redundant.</returns>
+        public abstract bool IsRedundant(ControlPoint other, double time);
+
         public bool Equals(ControlPoint other) => Time == other?.Time && EquivalentTo(other);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index df68d8acd2..37a3dbf592 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Beatmaps.ControlPoints
                     break;
             }
 
-            return existing?.EquivalentTo(newPoint) == true;
+            return newPoint.IsRedundant(existing, time);
         }
 
         private void groupItemAdded(ControlPoint controlPoint)
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 8b21098a51..44522dc927 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -29,5 +29,6 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public override bool EquivalentTo(ControlPoint other) =>
             other is DifficultyControlPoint otherTyped && otherTyped.SpeedMultiplier.Equals(SpeedMultiplier);
+        public override bool IsRedundant(ControlPoint other, double time) => EquivalentTo(other);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
index 369b93ff3d..8066c6b577 100644
--- a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
@@ -38,5 +38,6 @@ namespace osu.Game.Beatmaps.ControlPoints
         public override bool EquivalentTo(ControlPoint other) =>
             other is EffectControlPoint otherTyped &&
             KiaiMode == otherTyped.KiaiMode && OmitFirstBarLine == otherTyped.OmitFirstBarLine;
+        public override bool IsRedundant(ControlPoint other, double time) => !OmitFirstBarLine && EquivalentTo(other);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index 393bcfdb3c..cf7c842b24 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -71,5 +71,6 @@ namespace osu.Game.Beatmaps.ControlPoints
         public override bool EquivalentTo(ControlPoint other) =>
             other is SampleControlPoint otherTyped &&
             SampleBank == otherTyped.SampleBank && SampleVolume == otherTyped.SampleVolume;
+        public override bool IsRedundant(ControlPoint other, double time) => EquivalentTo(other);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index 158788964b..d14ac1221b 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -50,6 +50,10 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public override bool EquivalentTo(ControlPoint other) =>
             other is TimingControlPoint otherTyped
-            && Time == otherTyped.Time && TimeSignature == otherTyped.TimeSignature && BeatLength.Equals(otherTyped.BeatLength);
+            && TimeSignature == otherTyped.TimeSignature && BeatLength.Equals(otherTyped.BeatLength);
+
+        public override bool IsRedundant(ControlPoint other, double time) =>
+            EquivalentTo(other)
+            && other.Time == time;
     }
 }

From f115fecb23c13b7a2fbfc99e38b1eef458866199 Mon Sep 17 00:00:00 2001
From: Alchyr <isithalchyr@gmail.com>
Date: Thu, 9 Apr 2020 09:34:40 -0700
Subject: [PATCH 3/6] Fix formatting

---
 osu.Game/Beatmaps/ControlPoints/ControlPoint.cs           | 6 +++---
 osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs | 3 ++-
 osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs     | 3 ++-
 osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs     | 3 ++-
 osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs     | 6 +++---
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
index 411a4441de..9599ad184b 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
@@ -28,10 +28,10 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <summary>
         /// Whether this control point results in a meaningful change when placed after another.
         /// </summary>
-        /// <param name="other">Another control point to compare with.</param>
-        /// <param name="time">The time this timing point will be placed at.</param>
+        /// <param name="existing">An existing control point to compare with.</param>
+        /// <param name="time">The time this control point will be placed at if it is added.</param>
         /// <returns>Whether redundant.</returns>
-        public abstract bool IsRedundant(ControlPoint other, double time);
+        public abstract bool IsRedundant(ControlPoint existing, double time);
 
         public bool Equals(ControlPoint other) => Time == other?.Time && EquivalentTo(other);
     }
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 44522dc927..dc856b0a0a 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -29,6 +29,7 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public override bool EquivalentTo(ControlPoint other) =>
             other is DifficultyControlPoint otherTyped && otherTyped.SpeedMultiplier.Equals(SpeedMultiplier);
-        public override bool IsRedundant(ControlPoint other, double time) => EquivalentTo(other);
+
+        public override bool IsRedundant(ControlPoint existing, double time) => EquivalentTo(existing);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
index 8066c6b577..d050f44ba4 100644
--- a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
@@ -38,6 +38,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         public override bool EquivalentTo(ControlPoint other) =>
             other is EffectControlPoint otherTyped &&
             KiaiMode == otherTyped.KiaiMode && OmitFirstBarLine == otherTyped.OmitFirstBarLine;
-        public override bool IsRedundant(ControlPoint other, double time) => !OmitFirstBarLine && EquivalentTo(other);
+
+        public override bool IsRedundant(ControlPoint existing, double time) => !OmitFirstBarLine && EquivalentTo(existing);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index cf7c842b24..38edbe70da 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -71,6 +71,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         public override bool EquivalentTo(ControlPoint other) =>
             other is SampleControlPoint otherTyped &&
             SampleBank == otherTyped.SampleBank && SampleVolume == otherTyped.SampleVolume;
-        public override bool IsRedundant(ControlPoint other, double time) => EquivalentTo(other);
+
+        public override bool IsRedundant(ControlPoint existing, double time) => EquivalentTo(existing);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index d14ac1221b..316c603ece 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -52,8 +52,8 @@ namespace osu.Game.Beatmaps.ControlPoints
             other is TimingControlPoint otherTyped
             && TimeSignature == otherTyped.TimeSignature && BeatLength.Equals(otherTyped.BeatLength);
 
-        public override bool IsRedundant(ControlPoint other, double time) =>
-            EquivalentTo(other)
-            && other.Time == time;
+        public override bool IsRedundant(ControlPoint existing, double time) =>
+            EquivalentTo(existing)
+            && existing.Time == time;
     }
 }

From 69fb984e71fae2c371b19de763cbf8a80ff861d2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Apr 2020 17:04:09 +0900
Subject: [PATCH 4/6] Remove EquivalentTo() and Equals()

---
 osu.Game/Beatmaps/ControlPoints/ControlPoint.cs       | 11 +----------
 .../Beatmaps/ControlPoints/DifficultyControlPoint.cs  |  7 +++----
 osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs | 10 +++++-----
 osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs |  9 ++++-----
 osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs |  9 ++-------
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs            |  7 ++++---
 osu.Game/Graphics/Containers/BeatSyncedContainer.cs   |  2 +-
 7 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
index 9599ad184b..f9bb3877d3 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
@@ -5,7 +5,7 @@ using System;
 
 namespace osu.Game.Beatmaps.ControlPoints
 {
-    public abstract class ControlPoint : IComparable<ControlPoint>, IEquatable<ControlPoint>
+    public abstract class ControlPoint : IComparable<ControlPoint>
     {
         /// <summary>
         /// The time at which the control point takes effect.
@@ -18,13 +18,6 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public int CompareTo(ControlPoint other) => Time.CompareTo(other.Time);
 
-        /// <summary>
-        /// Whether this control point is equivalent to another, ignoring time.
-        /// </summary>
-        /// <param name="other">Another control point to compare with.</param>
-        /// <returns>Whether equivalent.</returns>
-        public abstract bool EquivalentTo(ControlPoint other);
-
         /// <summary>
         /// Whether this control point results in a meaningful change when placed after another.
         /// </summary>
@@ -32,7 +25,5 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <param name="time">The time this control point will be placed at if it is added.</param>
         /// <returns>Whether redundant.</returns>
         public abstract bool IsRedundant(ControlPoint existing, double time);
-
-        public bool Equals(ControlPoint other) => Time == other?.Time && EquivalentTo(other);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index dc856b0a0a..42140462cb 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -27,9 +27,8 @@ namespace osu.Game.Beatmaps.ControlPoints
             set => SpeedMultiplierBindable.Value = value;
         }
 
-        public override bool EquivalentTo(ControlPoint other) =>
-            other is DifficultyControlPoint otherTyped && otherTyped.SpeedMultiplier.Equals(SpeedMultiplier);
-
-        public override bool IsRedundant(ControlPoint existing, double time) => EquivalentTo(existing);
+        public override bool IsRedundant(ControlPoint existing, double time)
+            => existing is DifficultyControlPoint existingDifficulty
+               && SpeedMultiplier == existingDifficulty.SpeedMultiplier;
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
index d050f44ba4..f7a232c394 100644
--- a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
@@ -35,10 +35,10 @@ namespace osu.Game.Beatmaps.ControlPoints
             set => KiaiModeBindable.Value = value;
         }
 
-        public override bool EquivalentTo(ControlPoint other) =>
-            other is EffectControlPoint otherTyped &&
-            KiaiMode == otherTyped.KiaiMode && OmitFirstBarLine == otherTyped.OmitFirstBarLine;
-
-        public override bool IsRedundant(ControlPoint existing, double time) => !OmitFirstBarLine && EquivalentTo(existing);
+        public override bool IsRedundant(ControlPoint existing, double time)
+            => !OmitFirstBarLine
+               && existing is EffectControlPoint existingEffect
+               && KiaiMode == existingEffect.KiaiMode
+               && OmitFirstBarLine == existingEffect.OmitFirstBarLine;
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index 38edbe70da..0fced16b4d 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -68,10 +68,9 @@ namespace osu.Game.Beatmaps.ControlPoints
             return newSampleInfo;
         }
 
-        public override bool EquivalentTo(ControlPoint other) =>
-            other is SampleControlPoint otherTyped &&
-            SampleBank == otherTyped.SampleBank && SampleVolume == otherTyped.SampleVolume;
-
-        public override bool IsRedundant(ControlPoint existing, double time) => EquivalentTo(existing);
+        public override bool IsRedundant(ControlPoint existing, double time)
+            => existing is SampleControlPoint existingSample
+               && SampleBank == existingSample.SampleBank
+               && SampleVolume == existingSample.SampleVolume;
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index 316c603ece..27f4662d49 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -48,12 +48,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         public double BPM => 60000 / BeatLength;
 
-        public override bool EquivalentTo(ControlPoint other) =>
-            other is TimingControlPoint otherTyped
-            && TimeSignature == otherTyped.TimeSignature && BeatLength.Equals(otherTyped.BeatLength);
-
-        public override bool IsRedundant(ControlPoint existing, double time) =>
-            EquivalentTo(existing)
-            && existing.Time == time;
+        // Timing points are never redundant as they can change the time signature.
+        public override bool IsRedundant(ControlPoint existing, double time) => false;
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 561707f9ef..5fa1da111d 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -174,9 +174,10 @@ namespace osu.Game.Beatmaps.Formats
                 return baseInfo;
             }
 
-            public override bool EquivalentTo(ControlPoint other) =>
-                base.EquivalentTo(other) && other is LegacySampleControlPoint otherTyped &&
-                CustomSampleBank == otherTyped.CustomSampleBank;
+            public override bool IsRedundant(ControlPoint existing, double time)
+                => base.IsRedundant(existing, time)
+                   && existing is LegacySampleControlPoint existingSample
+                   && CustomSampleBank == existingSample.CustomSampleBank;
         }
     }
 }
diff --git a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
index f36079682e..5a613d1a54 100644
--- a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
+++ b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Graphics.Containers
 
             TimeSinceLastBeat = beatLength - TimeUntilNextBeat;
 
-            if (timingPoint.Equals(lastTimingPoint) && beatIndex == lastBeat)
+            if (timingPoint == lastTimingPoint && beatIndex == lastBeat)
                 return;
 
             using (BeginDelayedSequence(-TimeSinceLastBeat, true))

From 9aac98664ce9379938cea94e62dc3bb31df13a26 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Apr 2020 17:06:12 +0900
Subject: [PATCH 5/6] Remove unnecessary time property

---
 osu.Game/Beatmaps/ControlPoints/ControlPoint.cs           | 7 +++----
 osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs       | 2 +-
 osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs | 2 +-
 osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs     | 2 +-
 osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs     | 2 +-
 osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs     | 2 +-
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs                | 4 ++--
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
index f9bb3877d3..a1822a1163 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
@@ -19,11 +19,10 @@ namespace osu.Game.Beatmaps.ControlPoints
         public int CompareTo(ControlPoint other) => Time.CompareTo(other.Time);
 
         /// <summary>
-        /// Whether this control point results in a meaningful change when placed after another.
+        /// Determines whether this <see cref="ControlPoint"/> results in a meaningful change when placed alongside another.
         /// </summary>
         /// <param name="existing">An existing control point to compare with.</param>
-        /// <param name="time">The time this control point will be placed at if it is added.</param>
-        /// <returns>Whether redundant.</returns>
-        public abstract bool IsRedundant(ControlPoint existing, double time);
+        /// <returns>Whether this <see cref="ControlPoint"/> is redundant when placed alongside <paramref name="existing"/>.</returns>
+        public abstract bool IsRedundant(ControlPoint existing);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index 37a3dbf592..8e4079f776 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Beatmaps.ControlPoints
                     break;
             }
 
-            return newPoint.IsRedundant(existing, time);
+            return newPoint.IsRedundant(existing);
         }
 
         private void groupItemAdded(ControlPoint controlPoint)
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 42140462cb..2448b2b25c 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Beatmaps.ControlPoints
             set => SpeedMultiplierBindable.Value = value;
         }
 
-        public override bool IsRedundant(ControlPoint existing, double time)
+        public override bool IsRedundant(ControlPoint existing)
             => existing is DifficultyControlPoint existingDifficulty
                && SpeedMultiplier == existingDifficulty.SpeedMultiplier;
     }
diff --git a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
index f7a232c394..9b69147468 100644
--- a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Beatmaps.ControlPoints
             set => KiaiModeBindable.Value = value;
         }
 
-        public override bool IsRedundant(ControlPoint existing, double time)
+        public override bool IsRedundant(ControlPoint existing)
             => !OmitFirstBarLine
                && existing is EffectControlPoint existingEffect
                && KiaiMode == existingEffect.KiaiMode
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index 0fced16b4d..61851a00d7 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Beatmaps.ControlPoints
             return newSampleInfo;
         }
 
-        public override bool IsRedundant(ControlPoint existing, double time)
+        public override bool IsRedundant(ControlPoint existing)
             => existing is SampleControlPoint existingSample
                && SampleBank == existingSample.SampleBank
                && SampleVolume == existingSample.SampleVolume;
diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index 27f4662d49..1927dd6575 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -49,6 +49,6 @@ namespace osu.Game.Beatmaps.ControlPoints
         public double BPM => 60000 / BeatLength;
 
         // Timing points are never redundant as they can change the time signature.
-        public override bool IsRedundant(ControlPoint existing, double time) => false;
+        public override bool IsRedundant(ControlPoint existing) => false;
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 5fa1da111d..556527bfd5 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -174,8 +174,8 @@ namespace osu.Game.Beatmaps.Formats
                 return baseInfo;
             }
 
-            public override bool IsRedundant(ControlPoint existing, double time)
-                => base.IsRedundant(existing, time)
+            public override bool IsRedundant(ControlPoint existing)
+                => base.IsRedundant(existing)
                    && existing is LegacySampleControlPoint existingSample
                    && CustomSampleBank == existingSample.CustomSampleBank;
         }

From 0fba93bf658d917286defb5b029fcf5bc0f1b566 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Apr 2020 17:10:13 +0900
Subject: [PATCH 6/6] Add back null check

---
 osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index 8e4079f776..d33a922a32 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Beatmaps.ControlPoints
                     break;
             }
 
-            return newPoint.IsRedundant(existing);
+            return newPoint?.IsRedundant(existing) == true;
         }
 
         private void groupItemAdded(ControlPoint controlPoint)