h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 10:02:59 +08:00
Code Issues Releases Wiki Activity

Fix adjustment not working when dragged before object

Browse Source
This commit is contained in:
smoogipoo 2020-02-06 14:47:43 +09:00
parent c138e3907e
commit 6ae0efa40d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
View File

@ -275,18 +275,18 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
case IHasRepeats repeatHitObject: case IHasRepeats repeatHitObject:
// find the number of repeats which can fit in the requested time. // find the number of repeats which can fit in the requested time.
var lengthOfOneRepeat = repeatHitObject.Duration / (repeatHitObject.RepeatCount + 1); var lengthOfOneRepeat = repeatHitObject.Duration / (repeatHitObject.RepeatCount + 1);
var proposedCount = (int)((time - hitObject.StartTime) / lengthOfOneRepeat) - 1; var proposedCount = Math.Max(0, (int)((time - hitObject.StartTime) / lengthOfOneRepeat) - 1);
if (proposedCount == repeatHitObject.RepeatCount || proposedCount < 0) if (proposedCount == repeatHitObject.RepeatCount)
return; return;
repeatHitObject.RepeatCount = proposedCount; repeatHitObject.RepeatCount = proposedCount;
break; break;
case IHasEndTime endTimeHitObject: case IHasEndTime endTimeHitObject:
var snappedTime = beatSnapProvider.SnapTime(time); var snappedTime = Math.Max(hitObject.StartTime, beatSnapProvider.SnapTime(time));
if (endTimeHitObject.EndTime == snappedTime || snappedTime <= hitObject.StartTime) if (endTimeHitObject.EndTime == snappedTime)
return; return;
endTimeHitObject.EndTime = snappedTime; endTimeHitObject.EndTime = snappedTime;