Merge branch 'master' into remove-local-realm-thread-switch-handling

This commit is contained in:
Dean Herbert
2021-10-04 20:52:44 +09:00
131 changed files with 812 additions and 627 deletions

View File

@ -244,7 +244,7 @@ namespace osu.Game
List<ScoreInfo> getBeatmapScores(BeatmapSetInfo set)
{
var beatmapIds = BeatmapManager.QueryBeatmaps(b => b.BeatmapSetInfoID == set.ID).Select(b => b.ID).ToList();
return ScoreManager.QueryScores(s => beatmapIds.Contains(s.Beatmap.ID)).ToList();
return ScoreManager.QueryScores(s => beatmapIds.Contains(s.BeatmapInfo.ID)).ToList();
}
BeatmapManager.ItemRemoved.BindValueChanged(i =>