From a1496cd8f3afed32bd9c126a18dc8a3714ca6212 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 08:28:09 +0300
Subject: [PATCH] Remove necessity of using `CurrentModeRank` as a fallback

---
 .../TestSceneMultiplayerParticipantsList.cs            | 10 ++++++++--
 .../Multiplayer/Participants/ParticipantPanel.cs       |  4 ----
 osu.Game/Users/User.cs                                 |  9 ++++++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 0f7a9b442d..5a0234e379 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -155,7 +155,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     {
                         Id = i,
                         Username = $"User {i}",
-                        CurrentModeRank = RNG.Next(1, 100000),
+                        AllStatistics =
+                        {
+                            { Ruleset.Value, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
+                        },
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                     });
 
@@ -193,7 +196,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 {
                     Id = 0,
                     Username = "User 0",
-                    CurrentModeRank = RNG.Next(1, 100000),
+                    AllStatistics =
+                    {
+                        { Ruleset.Value, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
+                    },
                     CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                 });
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 74bc86f279..e78264223e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -165,10 +165,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
             var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
 
             var currentModeRank = User.User?.GetStatisticsFor(ruleset)?.GlobalRank;
-
-            // fallback to current mode rank for testing purposes.
-            currentModeRank ??= User.User?.CurrentModeRank;
-
             userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
 
             userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 467f00e409..621d70301d 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -243,7 +243,10 @@ namespace osu.Game.Users
         [JsonExtensionData]
         private readonly IDictionary<string, JToken> otherProperties = new Dictionary<string, JToken>();
 
-        private readonly Dictionary<RulesetInfo, UserStatistics> statisticsCache = new Dictionary<RulesetInfo, UserStatistics>();
+        /// <summary>
+        /// Map for ruleset with their associated user statistics, can be altered for testing purposes.
+        /// </summary>
+        internal readonly Dictionary<RulesetInfo, UserStatistics> AllStatistics = new Dictionary<RulesetInfo, UserStatistics>();
 
         /// <summary>
         /// Retrieves the user statistics for a certain ruleset.
@@ -254,10 +257,10 @@ namespace osu.Game.Users
         // todo: this should likely be moved to a separate UserCompact class at some point.
         public UserStatistics GetStatisticsFor(RulesetInfo ruleset)
         {
-            if (statisticsCache.TryGetValue(ruleset, out var existing))
+            if (AllStatistics.TryGetValue(ruleset, out var existing))
                 return existing;
 
-            return statisticsCache[ruleset] = parseStatisticsFor(ruleset);
+            return AllStatistics[ruleset] = parseStatisticsFor(ruleset);
         }
 
         private UserStatistics parseStatisticsFor(RulesetInfo ruleset)