From f78c853bc752f33d5fff6688fd286182e8ecd476 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 6 Feb 2022 10:59:53 +0800
Subject: [PATCH] Calculate max combo locally in
 `PerformanceBreakdownCalculator`

---
 .../PerformanceBreakdownCalculator.cs         | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
index d68c2edb40..87e60fbe9d 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
@@ -51,17 +51,7 @@ namespace osu.Game.Rulesets.Difficulty
                 perfectPlay.Passed = true;
 
                 // calculate max combo
-                var difficulty = await difficultyCache.GetDifficultyAsync(
-                    playableBeatmap.BeatmapInfo,
-                    score.Ruleset,
-                    score.Mods,
-                    cancellationToken
-                ).ConfigureAwait(false);
-
-                if (difficulty == null)
-                    return null;
-
-                perfectPlay.MaxCombo = difficulty.Value.MaxCombo;
+                perfectPlay.MaxCombo = calculateMaxCombo(playableBeatmap);
 
                 // create statistics assuming all hit objects have perfect hit result
                 var statistics = playableBeatmap.HitObjects
@@ -86,11 +76,23 @@ namespace osu.Game.Rulesets.Difficulty
                 }
 
                 // calculate performance for this perfect score
+                var difficulty = await difficultyCache.GetDifficultyAsync(
+                    playableBeatmap.BeatmapInfo,
+                    score.Ruleset,
+                    score.Mods,
+                    cancellationToken
+                ).ConfigureAwait(false);
+
                 // ScorePerformanceCache is not used to avoid caching multiple copies of essentially identical perfect performance attributes
-                return ruleset.CreatePerformanceCalculator(difficulty.Value.Attributes, perfectPlay)?.Calculate();
+                return difficulty == null ? null : ruleset.CreatePerformanceCalculator(difficulty.Value.Attributes, perfectPlay)?.Calculate();
             }, cancellationToken);
         }
 
+        private int calculateMaxCombo(IBeatmap beatmap)
+        {
+            return beatmap.HitObjects.SelectMany(getPerfectHitResults).Count(r => r.AffectsCombo());
+        }
+
         private IEnumerable<HitResult> getPerfectHitResults(HitObject hitObject)
         {
             foreach (HitObject nested in hitObject.NestedHitObjects)