diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs index cb422d8c06..3f230099da 100644 --- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs +++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs @@ -245,6 +245,7 @@ namespace osu.Game.Tests.Visual.Playlists var multiplayerUserScore = new MultiplayerScore { ID = highestScoreId, + SoloScoreID = (ulong?)highestScoreId, Accuracy = userScore.Accuracy, Passed = userScore.Passed, Rank = userScore.Rank, @@ -262,9 +263,11 @@ namespace osu.Game.Tests.Visual.Playlists for (int i = 1; i <= scores_per_result; i++) { + int nextLowest = getNextLowestScoreId(); multiplayerUserScore.ScoresAround.Lower.Scores.Add(new MultiplayerScore { - ID = getNextLowestScoreId(), + ID = nextLowest, + SoloScoreID = (ulong?)nextLowest, Accuracy = userScore.Accuracy, Passed = true, Rank = userScore.Rank, @@ -277,9 +280,11 @@ namespace osu.Game.Tests.Visual.Playlists }, }); + int nextHighest = getNextHighestScoreId(); multiplayerUserScore.ScoresAround.Higher.Scores.Add(new MultiplayerScore { - ID = getNextHighestScoreId(), + ID = nextHighest, + SoloScoreID = (ulong?)nextHighest, Accuracy = userScore.Accuracy, Passed = true, Rank = userScore.Rank, @@ -309,9 +314,11 @@ namespace osu.Game.Tests.Visual.Playlists for (int i = 1; i <= scores_per_result; i++) { + int id = sort == "score_asc" ? getNextHighestScoreId() : getNextLowestScoreId(); result.Scores.Add(new MultiplayerScore { - ID = sort == "score_asc" ? getNextHighestScoreId() : getNextLowestScoreId(), + ID = id, + SoloScoreID = (ulong?)id, Accuracy = 1, Passed = true, Rank = ScoreRank.X, diff --git a/osu.Game/Online/Rooms/MultiplayerScore.cs b/osu.Game/Online/Rooms/MultiplayerScore.cs index d5e0c7a970..21aa8df54b 100644 --- a/osu.Game/Online/Rooms/MultiplayerScore.cs +++ b/osu.Game/Online/Rooms/MultiplayerScore.cs @@ -75,7 +75,7 @@ namespace osu.Game.Online.Rooms var scoreInfo = new ScoreInfo { - OnlineID = ID, + OnlineID = (long?)SoloScoreID ?? -1, TotalScore = TotalScore, MaxCombo = MaxCombo, BeatmapInfo = beatmap,