sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-25 15:37:24 +09:00
Code Issues Packages Projects Releases Wiki Activity

Ensure all hitobject level control points are populated before calling virtual defaults application

Browse Source
This commit is contained in:
Dean Herbert 2021-09-01 18:26:00 +09:00
parent d587dc6203
commit 1aff4c2238
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Rulesets/Objects/HitObject.cs
View File

@ -106,8 +106,6 @@ namespace osu.Game.Rulesets.Objects
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
public void ApplyDefaults(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty, CancellationToken cancellationToken = default) public void ApplyDefaults(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty, CancellationToken cancellationToken = default)
{ {
ApplyDefaultsToSelf(controlPointInfo, difficulty);
if (controlPointInfo is LegacyControlPointInfo legacyInfo) if (controlPointInfo is LegacyControlPointInfo legacyInfo)
{ {
// This is done here since ApplyDefaultsToSelf may be used to determine the end time // This is done here since ApplyDefaultsToSelf may be used to determine the end time
@ -120,6 +118,8 @@ namespace osu.Game.Rulesets.Objects
DifficultyControlPoint ??= DifficultyControlPoint.DEFAULT; DifficultyControlPoint ??= DifficultyControlPoint.DEFAULT;
} }
ApplyDefaultsToSelf(controlPointInfo, difficulty);
nestedHitObjects.Clear(); nestedHitObjects.Clear();
CreateNestedHitObjects(cancellationToken); CreateNestedHitObjects(cancellationToken);