Merge branch 'master' of github.com:ppy/osu into general-fixes

# Conflicts: # osu.Game/Beatmaps/Beatmap.cs
2026-05-21 04:19:53 +08:00 · 2017-02-17 21:22:34 +01:00
parent fe3a6248ec 6a58d7ab2a
commit 1198705a6f
1 changed files with 4 additions and 0 deletions
@@ -39,6 +39,9 @@ namespace osu.Game.Beatmaps

            ControlPoint timingPoint = null;
            foreach (var controlPoint in ControlPoints)
+                // Some beatmaps have the first timingPoint (accidentally) start after the first HitObject(s).
+                // This null check makes it so that the first ControlPoint that makes a timing change is used as
+                // the timingPoint for those HitObject(s).
                if (controlPoint.Time <= time || timingPoint == null)
                {
                    if (controlPoint.TimingChange)
@@ -49,6 +52,7 @@ namespace osu.Game.Beatmaps
                    else overridePoint = controlPoint;
                }
                else break;
+            }

            return timingPoint;
        }