RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly bypass last selected when it is filtered

This commit is contained in:
Dean Herbert 2020-03-20 13:01:24 +09:00
parent 3a50c4bb51
commit be4a97c289
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -333,8 +333,7 @@ public bool SelectNextRandom()
else
set = visibleSets.ElementAt(RNG.Next(visibleSets.Count));
var visibleBeatmaps = set.Beatmaps.Where(s => !s.Filtered.Value).ToList();
select(visibleBeatmaps[RNG.Next(visibleBeatmaps.Count)]);
select(set);
return true;
}
@ -756,7 +755,7 @@ public CarouselRoot(BeatmapCarousel carousel)
protected override void PerformSelection()
{
if (LastSelected == null)
if (LastSelected == null || LastSelected.Filtered.Value)
carousel.SelectNextRandom();
else
base.PerformSelection();