Merge branch 'master' into scoreprocessor-rework

This commit is contained in:
Dean Herbert
2022-03-09 23:04:18 +09:00
committed by GitHub
24 changed files with 780 additions and 138 deletions

View File

@ -131,7 +131,7 @@ namespace osu.Game.Scoring
public async Task<long> GetTotalScoreAsync([NotNull] ScoreInfo score, ScoringMode mode = ScoringMode.Standardised, CancellationToken cancellationToken = default)
{
// TODO: This is required for playlist aggregate scores. They should likely not be getting here in the first place.
if (string.IsNullOrEmpty(score.BeatmapInfo.Hash))
if (string.IsNullOrEmpty(score.BeatmapInfo.MD5Hash))
return score.TotalScore;
int beatmapMaxCombo;