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

Merge pull request #16390 from peppy/fix-filter-matching-tests 

Update `FilterMatchingTest` and filter code to use ruleset's `OnlineID`
This commit is contained in:
Dan Balasescu 2022-01-10 13:10:51 +09:00 committed by GitHub
parent 3c3210e8ef 02d8a6359a
commit 6f18db2136
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
View File

@ -16,7 +16,8 @@ public class FilterMatchingTest
{
private BeatmapInfo getExampleBeatmap() => new BeatmapInfo
{
Ruleset = new RulesetInfo { OnlineID = 5 },
Ruleset = new RulesetInfo { OnlineID = 0 },
RulesetID = 0,
StarRating = 4.0d,
BaseDifficulty = new BeatmapDifficulty
{

4
osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
View File

@ -28,8 +28,8 @@ public override void Filter(FilterCriteria criteria)
bool match =
criteria.Ruleset == null ||
BeatmapInfo.RulesetID == criteria.Ruleset.ID ||
(BeatmapInfo.RulesetID == 0 && criteria.Ruleset.ID > 0 && criteria.AllowConvertedBeatmaps);
BeatmapInfo.RulesetID == criteria.Ruleset.OnlineID ||
(BeatmapInfo.RulesetID == 0 && criteria.Ruleset.OnlineID > 0 && criteria.AllowConvertedBeatmaps);
if (BeatmapInfo.BeatmapSet?.Equals(criteria.SelectedBeatmapSet) == true)
{