h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-14 07:24:04 +08:00
Code Issues Releases Wiki Activity

Fix random selection potentially selecting a filtered-away beatmap

Browse Source
This commit is contained in:
Dean Herbert
2025-05-31 17:35:55 +09:00
Unverified
parent 0fc129fbac
commit 4d33602ccd
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/SelectV2/BeatmapCarousel.cs
+12 -8
View File
@@ -219,13 +219,7 @@ namespace osu.Game.Screens.SelectV2
return;
case BeatmapSetInfo setInfo:
// Selecting a set isn't valid – let's re-select the first visible difficulty.
if (grouping.SetItems.TryGetValue(setInfo, out var items))
{
var beatmaps = items.Select(i => i.Model).OfType<BeatmapInfo>();
RequestRecommendedSelection(beatmaps);
}
selectRecommendedDifficultyForBeatmapSet(setInfo);
return;
case BeatmapInfo beatmapInfo:
@@ -284,6 +278,16 @@ namespace osu.Game.Screens.SelectV2
setExpandedGroup(groupForReselection);
}
private void selectRecommendedDifficultyForBeatmapSet(BeatmapSetInfo beatmapSet)
{
// Selecting a set isn't valid – let's re-select the first visible difficulty.
if (grouping.SetItems.TryGetValue(beatmapSet, out var items))
{
var beatmaps = items.Select(i => i.Model).OfType<BeatmapInfo>();
RequestRecommendedSelection(beatmaps);
}
}
/// <summary>
/// If we don't have a selection and there's a single beatmap set returned, select it for the user.
/// </summary>
@@ -644,7 +648,7 @@ namespace osu.Game.Screens.SelectV2
if (CurrentSelectionItem != null)
playSpinSample(distanceBetween(carouselItems.First(i => !ReferenceEquals(i.Model, set)), CurrentSelectionItem), visibleSets.Count);
RequestRecommendedSelection(set.Beatmaps.Where(b => !b.Hidden));
selectRecommendedDifficultyForBeatmapSet(set);
return true;
}
osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs
+8 -5
View File
@@ -76,15 +76,18 @@ namespace osu.Game.Screens.SelectV2
{
var beatmap = (BeatmapInfo)item.Model;
bool newBeatmapSet = lastBeatmap?.BeatmapSet!.ID != beatmap.BeatmapSet!.ID;
if (newBeatmapSet)
{
if (!setMap.TryGetValue(beatmap.BeatmapSet!, out currentSetItems))
setMap[beatmap.BeatmapSet!] = currentSetItems = new HashSet<CarouselItem>();
}
if (BeatmapSetsGroupedTogether)
{
bool newBeatmapSet = lastBeatmap?.BeatmapSet!.ID != beatmap.BeatmapSet!.ID;
if (newBeatmapSet)
{
if (!setMap.TryGetValue(beatmap.BeatmapSet!, out currentSetItems))
setMap[beatmap.BeatmapSet!] = currentSetItems = new HashSet<CarouselItem>();
if (groupItem != null)
groupItem.NestedItemCount++;