From 447a55ce11cf144eddc85dea8e37d99c2dbb46e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 20:16:53 +0900
Subject: [PATCH] Fix incorrect null handling in GameplayLeaderboard

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs       | 6 ++++--
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 83b70911c6..cb20deb272 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -56,6 +57,7 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
+        [CanBeNull]
         public User User { get; }
 
         private readonly bool trackedPlayer;
@@ -68,7 +70,7 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         /// <param name="user">The score's player.</param>
         /// <param name="trackedPlayer">Whether the player is the local user or a replay player.</param>
-        public GameplayLeaderboardScore(User user, bool trackedPlayer)
+        public GameplayLeaderboardScore([CanBeNull] User user, bool trackedPlayer)
         {
             User = user;
             this.trackedPlayer = trackedPlayer;
@@ -180,7 +182,7 @@ namespace osu.Game.Screens.Play.HUD
                                                 Origin = Anchor.CentreLeft,
                                                 Colour = Color4.White,
                                                 Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
-                                                Text = User.Username,
+                                                Text = User?.Username,
                                                 Truncate = true,
                                                 Shadow = false,
                                             }
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 00e2b8bfa7..e7e5459f76 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.Play.HUD
                 var trackedUser = new TrackedUserData();
 
                 userScores[userId] = trackedUser;
-                var leaderboardScore = AddPlayer(resolvedUser, resolvedUser.Id == api.LocalUser.Value.Id);
+                var leaderboardScore = AddPlayer(resolvedUser, resolvedUser?.Id == api.LocalUser.Value.Id);
 
                 ((IBindable<double>)leaderboardScore.Accuracy).BindTo(trackedUser.Accuracy);
                 ((IBindable<double>)leaderboardScore.TotalScore).BindTo(trackedUser.Score);