From 45122594e50ce23734e16be5332ee5b6603044cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Jun 2021 16:24:07 +0900
Subject: [PATCH] Remove the synchronous version of `PrepareScoreForResults`

Replaces all existing usages with the `async` version.
---
 .../OnlinePlay/Playlists/PlaylistsPlayer.cs   |  5 +++--
 osu.Game/Screens/Play/Player.cs               | 20 +++++--------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index cc1fb0b321..567ea6b988 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Screens;
@@ -54,9 +55,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             return new PlaylistsResultsScreen(score, RoomId.Value.Value, PlaylistItem, true);
         }
 
-        protected override void PrepareScoreForResults(Score score)
+        protected override async Task PrepareScoreForResultsAsync(Score score)
         {
-            base.PrepareScoreForResults(score);
+            await base.PrepareScoreForResultsAsync(score).ConfigureAwait(false);
 
             Score.ScoreInfo.TotalScore = (int)Math.Round(ScoreProcessor.GetStandardisedScore());
         }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 9fe12c58de..70cac9d27a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -626,7 +626,7 @@ namespace osu.Game.Screens.Play
 
         /// <summary>
         /// This delegate, when set, means the results screen has been queued to appear.
-        /// The display of the results screen may be delayed by any work being done in <see cref="PrepareScoreForResults"/> and <see cref="PrepareScoreForResultsAsync"/>.
+        /// The display of the results screen may be delayed by any work being done in <see cref="PrepareScoreForResultsAsync"/>.
         /// </summary>
         /// <remarks>
         /// Once set, this can *only* be cancelled by rewinding, ie. if <see cref="JudgementProcessor.HasCompleted">ScoreProcessor.HasCompleted</see> becomes <see langword="false"/>.
@@ -706,9 +706,6 @@ namespace osu.Game.Screens.Play
 
         private async Task<ScoreInfo> prepareScoreForResults()
         {
-            // ReSharper disable once MethodHasAsyncOverload
-            PrepareScoreForResults(Score);
-
             try
             {
                 await PrepareScoreForResultsAsync(Score).ConfigureAwait(false);
@@ -1007,22 +1004,15 @@ namespace osu.Game.Screens.Play
         /// <summary>
         /// Prepare the <see cref="Scoring.Score"/> for display at results.
         /// </summary>
-        /// <remarks>
-        /// This is run synchronously before <see cref="PrepareScoreForResultsAsync"/> is run.
-        /// </remarks>
         /// <param name="score">The <see cref="Scoring.Score"/> to prepare.</param>
-        protected virtual void PrepareScoreForResults(Score score)
+        /// <returns>A task that prepares the provided score. On completion, the score is assumed to be ready for display.</returns>
+        protected virtual Task PrepareScoreForResultsAsync(Score score)
         {
             // perform one final population to ensure everything is up-to-date.
             ScoreProcessor.PopulateScore(score.ScoreInfo);
-        }
 
-        /// <summary>
-        /// Prepare the <see cref="Scoring.Score"/> for display at results.
-        /// </summary>
-        /// <param name="score">The <see cref="Scoring.Score"/> to prepare.</param>
-        /// <returns>A task that prepares the provided score. On completion, the score is assumed to be ready for display.</returns>
-        protected virtual Task PrepareScoreForResultsAsync(Score score) => Task.CompletedTask;
+            return Task.CompletedTask;
+        }
 
         /// <summary>
         /// Creates the <see cref="ResultsScreen"/> for a <see cref="ScoreInfo"/>.