RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-03-04 10:29:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16628 from peppy/fix-realm-ruleset-ordering

Browse Source 
Fix custom rulesets being displayed before official ones
This commit is contained in:
Dan Balasescu 2022-01-26 19:19:01 +09:00 committed by GitHub
commit 0dd2de3e1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Rulesets/RulesetStore.cs
View File

@ -163,7 +163,10 @@ namespace osu.Game.Rulesets
}
}
availableRulesets.AddRange(detachedRulesets);
// add known official rulesets first..
availableRulesets.AddRange(detachedRulesets.Where(r => r.OnlineID >= 0).OrderBy(r => r.OnlineID));
// .. then add any customs
availableRulesets.AddRange(detachedRulesets.Where(r => r.OnlineID < 0).OrderBy(r => r.ShortName));
});
}

2
osu.Game/Screens/Select/Carousel/SetPanelContent.cs
View File

@ -87,7 +87,7 @@ namespace osu.Game.Screens.Select.Carousel
var beatmaps = carouselSet.Beatmaps.ToList();
return beatmaps.Count > maximum_difficulty_icons
? (IEnumerable<DifficultyIcon>)beatmaps.GroupBy(b => b.BeatmapInfo.RulesetID)
? (IEnumerable<DifficultyIcon>)beatmaps.GroupBy(b => b.BeatmapInfo.Ruleset.ShortName)
.Select(group => new FilterableGroupedDifficultyIcon(group.ToList(), group.Last().BeatmapInfo.Ruleset))
: beatmaps.Select(b => new FilterableDifficultyIcon(b));
}