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

Fix test failures where Beatmap is not provided

Browse Source
This commit is contained in:
Dean Herbert 2022-08-05 18:14:30 +09:00
parent 9a4d0494de
commit a682a823f4
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
View File

@ -122,20 +122,23 @@ namespace osu.Game.Rulesets.Osu.UI
RegisterPool<HitCircle, DrawableHitCircle>(20, 100); RegisterPool<HitCircle, DrawableHitCircle>(20, 100);
var sliders = osuBeatmap.HitObjects.OfType<Slider>(); int maxRepeatsOnOneSlider = 0;
int maxTicksOnOneSlider = 0;
if (sliders.Any()) var sliders = osuBeatmap?.HitObjects.OfType<Slider>();
if (sliders?.Any() == true)
{ {
// handle edge cases where a beatmap has a slider with many repeats. // handle edge cases where a beatmap has a slider with many repeats.
int maxRepeatsOnOneSlider = osuBeatmap.HitObjects.OfType<Slider>().Max(s => s.RepeatCount); maxRepeatsOnOneSlider = sliders?.Max(s => s.RepeatCount) ?? 0;
int maxTicksOnOneSlider = osuBeatmap.HitObjects.OfType<Slider>().Max(s => s.NestedHitObjects.OfType<SliderTick>().Count()); maxTicksOnOneSlider = sliders?.Max(s => s.NestedHitObjects.OfType<SliderTick>().Count()) ?? 0;
}
RegisterPool<Slider, DrawableSlider>(20, 100); RegisterPool<Slider, DrawableSlider>(20, 100);
RegisterPool<SliderHeadCircle, DrawableSliderHead>(20, 100); RegisterPool<SliderHeadCircle, DrawableSliderHead>(20, 100);
RegisterPool<SliderTailCircle, DrawableSliderTail>(20, 100); RegisterPool<SliderTailCircle, DrawableSliderTail>(20, 100);
RegisterPool<SliderTick, DrawableSliderTick>(Math.Max(maxTicksOnOneSlider, 20), Math.Max(maxTicksOnOneSlider, 200)); RegisterPool<SliderTick, DrawableSliderTick>(Math.Max(maxTicksOnOneSlider, 20), Math.Max(maxTicksOnOneSlider, 200));
RegisterPool<SliderRepeat, DrawableSliderRepeat>(Math.Max(maxRepeatsOnOneSlider, 20), Math.Max(maxRepeatsOnOneSlider, 200)); RegisterPool<SliderRepeat, DrawableSliderRepeat>(Math.Max(maxRepeatsOnOneSlider, 20), Math.Max(maxRepeatsOnOneSlider, 200));
}
RegisterPool<Spinner, DrawableSpinner>(2, 20); RegisterPool<Spinner, DrawableSpinner>(2, 20);
RegisterPool<SpinnerTick, DrawableSpinnerTick>(10, 200); RegisterPool<SpinnerTick, DrawableSpinnerTick>(10, 200);