h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 05:22:54 +08:00
Code Issues Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Salman Ahmed 2024-03-08 20:22:26 +03:00
parent 8d3e502262
commit a85be2a46d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Storyboards/StoryboardSprite.cs
View File

@ -97,10 +97,10 @@ namespace osu.Game.Storyboards
// If the logic above fails to find anything or discarded by the fact that there are loops present, latestEndTime will be double.MaxValue
// and thus conservativeEndTime will be used.
double conservativeEndTime = TimelineGroup.EndTime;
double conservativeEndTime = Commands.EndTime;
foreach (var l in loops)
conservativeEndTime = Math.Max(conservativeEndTime, l.StartTime + l.CommandsDuration * l.TotalIterations);
foreach (var l in loopingGroups)
conservativeEndTime = Math.Max(conservativeEndTime, l.StartTime + l.Duration * l.TotalIterations);
return Math.Min(latestEndTime, conservativeEndTime);
}