mirror of
https://github.com/ppy/osu.git
synced 2024-12-15 06:35:05 +08:00
Don't seek to current editor location when location is close to (or before) the first object
This commit is contained in:
parent
bdfc317a8e
commit
bfcd9e0f45
@ -1,6 +1,7 @@
|
||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||
// See the LICENCE file in the repository root for full licence text.
|
||||
|
||||
using System.Linq;
|
||||
using osu.Framework.Allocation;
|
||||
using osu.Framework.Screens;
|
||||
using osu.Game.Beatmaps;
|
||||
@ -27,7 +28,12 @@ namespace osu.Game.Screens.Edit.GameplayTest
|
||||
protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
|
||||
{
|
||||
var masterGameplayClockContainer = new MasterGameplayClockContainer(beatmap, gameplayStart);
|
||||
masterGameplayClockContainer.Reset(editorState.Time);
|
||||
|
||||
// Only reset the time to the current point if the editor is later than the normal start time (and the first object).
|
||||
// This allows more sane test playing from the start of the beatmap (ie. correctly adding lead-in time).
|
||||
if (editorState.Time > gameplayStart && editorState.Time > DrawableRuleset.Objects.FirstOrDefault()?.StartTime)
|
||||
masterGameplayClockContainer.Reset(editorState.Time);
|
||||
|
||||
return masterGameplayClockContainer;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user