h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 15:57:24 +08:00
Code Issues Releases Wiki Activity

Do not add extra sample control point after end of IHasRepeats objects

Browse Source
This commit is contained in:
Bartłomiej Dach 2024-07-02 09:12:34 +02:00
parent 847946937e
commit d4a8f6c8b0
No known key found for this signature in database
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game.Tests/Resources/per-slider-node-sample-settings.osu
View File

@ -1,4 +1,4 @@
osu file format v128
osu file format v128
[General]
SampleSet: Normal
@ -7,18 +7,13 @@ SampleSet: Normal
15,1000,4,1,0,100,1,0
2271,-100,4,1,0,5,0,0
6021,-100,4,1,0,100,0,0
9515,-100,4,1,0,5,0,0
9521,-100,4,1,0,100,0,0
10265,-100,4,1,0,5,0,0
13765,-100,4,1,0,100,0,0
13771,-100,4,1,0,5,0,0
8515,-100,4,1,0,5,0,0
12765,-100,4,1,0,100,0,0
14764,-100,4,1,0,5,0,0
14770,-100,4,1,0,50,0,0
18264,-100,4,1,0,100,0,0
18270,-100,4,1,0,50,0,0
21764,-100,4,1,0,5,0,0
21770,-100,4,1,0,50,0,0
25264,-100,4,1,0,100,0,0
25270,-100,4,1,0,50,0,0
17264,-100,4,1,0,5,0,0
17270,-100,4,1,0,50,0,0
22264,-100,4,1,0,100,0,0
[HitObjects]
113,54,2265,6,0,L|422:55,1,300,0|0,1:0|1:0,1:0:0:0:

2
osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
View File

@ -293,7 +293,7 @@ namespace osu.Game.Beatmaps.Formats
if (hasNodeSamples.NodeSamples[i].Count > 0)
yield return createSampleControlPointFor(nodeTime, hasNodeSamples.NodeSamples[i]);
if (spanDuration > LegacyBeatmapDecoder.CONTROL_POINT_LENIENCY + 1 && hitObject.Samples.Count > 0)
if (spanDuration > LegacyBeatmapDecoder.CONTROL_POINT_LENIENCY + 1 && hitObject.Samples.Count > 0 && i < hasNodeSamples.NodeSamples.Count - 1)
yield return createSampleControlPointFor(nodeTime + LegacyBeatmapDecoder.CONTROL_POINT_LENIENCY + 1, hitObject.Samples);
}
}