diff --git a/osu.Game.Tests/Visual/TestCaseUserProfile.cs b/osu.Game.Tests/Visual/TestCaseUserProfile.cs index da81de6a3a..2c3abe0049 100644 --- a/osu.Game.Tests/Visual/TestCaseUserProfile.cs +++ b/osu.Game.Tests/Visual/TestCaseUserProfile.cs @@ -42,12 +42,12 @@ namespace osu.Game.Tests.Visual LastVisit = DateTimeOffset.Now, Age = 1, ProfileOrder = new[] { "me" }, - CountryRank = 1, Statistics = new UserStatistics { Rank = 2148, PP = 4567.89m }, + CountryRank = 1, RankHistory = new User.RankHistoryData { Mode = @"osu", diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs index c305cc004a..0be9600815 100644 --- a/osu.Game/Users/User.cs +++ b/osu.Game/Users/User.cs @@ -26,9 +26,9 @@ namespace osu.Game.Users [JsonProperty(@"age")] public int? Age; - public int GlobalRank { get => Statistics.Ranks.GlobalRank; set => Statistics.Ranks.GlobalRank = value; } + public int GlobalRank { get => Statistics?.Ranks.GlobalRank ?? 0; set => Statistics.Ranks.GlobalRank = value; } - public int CountryRank { get => Statistics.Ranks.CountryRank; set => Statistics.Ranks.CountryRank = value; } + public int CountryRank { get => Statistics?.Ranks.CountryRank ?? 0; set => Statistics.Ranks.CountryRank = value; } //public Team Team; diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs index f047bd1980..f26db32cf0 100644 --- a/osu.Game/Users/UserStatistics.cs +++ b/osu.Game/Users/UserStatistics.cs @@ -23,7 +23,7 @@ namespace osu.Game.Users public decimal? PP; [JsonProperty(@"pp_rank")] - public int Rank { get => Ranks.GlobalRank; set => Ranks.GlobalRank = value; } + public int Rank { get => Ranks.GlobalRank ?? 0; set => Ranks.GlobalRank = value; } [JsonProperty(@"rank")] public UserRank Ranks; @@ -31,10 +31,10 @@ namespace osu.Game.Users public struct UserRank { [JsonProperty(@"global")] - public int GlobalRank; + public int? GlobalRank; [JsonProperty(@"country")] - public int CountryRank; + public int? CountryRank; } [JsonProperty(@"ranked_score")]