From a3806f44a51adb35ad97299aa2250d1138b6ce18 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Jan 2022 13:11:43 +0900
Subject: [PATCH] Add back `null` beatmap allowance to `GetTotalScore` flow to
 fix playlist aggregate scores

---
 osu.Game/Scoring/ScoreManager.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index ad2be7d813..dc90e819d4 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -132,9 +132,10 @@ namespace osu.Game.Scoring
         /// <returns>The total score.</returns>
         public async Task<long> GetTotalScoreAsync([NotNull] ScoreInfo score, ScoringMode mode = ScoringMode.Standardised, CancellationToken cancellationToken = default)
         {
-            // TODO: ??
-            // if (score.Beatmap == null)
-            //     return score.TotalScore;
+            // TODO: This is required for playlist aggregate scores. They should likely not be getting here in the first place.
+            // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+            if (score.BeatmapInfo == null)
+                return score.TotalScore;
 
             int beatmapMaxCombo;
             double accuracy = score.Accuracy;