mirror of
https://github.com/ppy/osu.git
synced 2025-02-15 05:32:56 +08:00
Ensure HitObject
-local control points are non-default after ApplyDefaults
We will probably want to make this whole flow more efficient in the future, but this should suffice for now.
This commit is contained in:
parent
b259192a8a
commit
dae7cdc4c5
@ -119,6 +119,8 @@ namespace osu.Game.Rulesets.Objects
|
|||||||
DifficultyControlPoint = (DifficultyControlPoint)legacyInfo.DifficultyPointAt(StartTime).DeepClone();
|
DifficultyControlPoint = (DifficultyControlPoint)legacyInfo.DifficultyPointAt(StartTime).DeepClone();
|
||||||
DifficultyControlPoint.Time = StartTime;
|
DifficultyControlPoint.Time = StartTime;
|
||||||
}
|
}
|
||||||
|
else if (DifficultyControlPoint == DifficultyControlPoint.DEFAULT)
|
||||||
|
DifficultyControlPoint = new DifficultyControlPoint();
|
||||||
|
|
||||||
ApplyDefaultsToSelf(controlPointInfo, difficulty);
|
ApplyDefaultsToSelf(controlPointInfo, difficulty);
|
||||||
|
|
||||||
@ -128,6 +130,8 @@ namespace osu.Game.Rulesets.Objects
|
|||||||
SampleControlPoint = (SampleControlPoint)legacyInfo.SamplePointAt(this.GetEndTime() + control_point_leniency).DeepClone();
|
SampleControlPoint = (SampleControlPoint)legacyInfo.SamplePointAt(this.GetEndTime() + control_point_leniency).DeepClone();
|
||||||
SampleControlPoint.Time = this.GetEndTime() + control_point_leniency;
|
SampleControlPoint.Time = this.GetEndTime() + control_point_leniency;
|
||||||
}
|
}
|
||||||
|
else if (SampleControlPoint == SampleControlPoint.DEFAULT)
|
||||||
|
SampleControlPoint = new SampleControlPoint();
|
||||||
|
|
||||||
nestedHitObjects.Clear();
|
nestedHitObjects.Clear();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user