Fix test failures

ppy · Aug 24, 2022 · adea29c · adea29c
1 parent 9c6968e
commit adea29c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -931,16 +931,14 @@ public void TestNaNControlPoints()
                 var controlPoints = (LegacyControlPointInfo)decoder.Decode(stream).ControlPointInfo;
 
                 Assert.That(controlPoints.TimingPoints.Count, Is.EqualTo(1));
-                Assert.That(controlPoints.DifficultyPoints.Count, Is.EqualTo(3));
+                Assert.That(controlPoints.DifficultyPoints.Count, Is.EqualTo(2));
 
                 Assert.That(controlPoints.TimingPointAt(1000).BeatLength, Is.EqualTo(500));
 
-                Assert.That(controlPoints.DifficultyPointAt(1000).SliderVelocity, Is.EqualTo(1));
                 Assert.That(controlPoints.DifficultyPointAt(2000).SliderVelocity, Is.EqualTo(1));
                 Assert.That(controlPoints.DifficultyPointAt(3000).SliderVelocity, Is.EqualTo(1));
 
 #pragma warning disable 618
-                Assert.That(((LegacyBeatmapDecoder.LegacyDifficultyControlPoint)controlPoints.DifficultyPointAt(1000)).GenerateTicks, Is.True);
                 Assert.That(((LegacyBeatmapDecoder.LegacyDifficultyControlPoint)controlPoints.DifficultyPointAt(2000)).GenerateTicks, Is.False);
                 Assert.That(((LegacyBeatmapDecoder.LegacyDifficultyControlPoint)controlPoints.DifficultyPointAt(3000)).GenerateTicks, Is.True);
 #pragma warning restore 618

diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -188,9 +188,8 @@ public LegacyDifficultyControlPoint()
             }
 
             public override bool IsRedundant(ControlPoint? existing)
-                => existing is LegacyDifficultyControlPoint existingLegacyDifficulty
-                   && base.IsRedundant(existing)
-                   && GenerateTicks == existingLegacyDifficulty.GenerateTicks;
+                => base.IsRedundant(existing)
+                   && GenerateTicks == ((existing as LegacyDifficultyControlPoint)?.GenerateTicks ?? true);
 
             public override void CopyFrom(ControlPoint other)
             {