h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 00:43:25 +08:00
Code Issues Releases Wiki Activity

Fix potential incorrect ordering

Browse Source
This commit is contained in:
smoogipoo 2021-08-30 19:41:44 +09:00
parent 4ebb11472d
commit e19d81c88c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
View File

@ -261,6 +261,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
var scoreInfos = newScores.Scores.Select(s => s.CreateScoreInfo(rulesets)) var scoreInfos = newScores.Scores.Select(s => s.CreateScoreInfo(rulesets))
.OrderByDescending(s => scoreManager.GetTotalScore(s)) .OrderByDescending(s => scoreManager.GetTotalScore(s))
.ThenBy(s => s.OnlineScoreID)
.ToList(); .ToList();
var topScore = scoreInfos.First(); var topScore = scoreInfos.First();

11
osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
View File

@ -146,7 +146,10 @@ namespace osu.Game.Screens.Select.Leaderboards
scores = scores.Where(s => s.Mods.Any(m => selectedMods.Contains(m.Acronym))); scores = scores.Where(s => s.Mods.Any(m => selectedMods.Contains(m.Acronym)));
} }
Scores = scores.OrderByDescending(s => scoreManager.GetTotalScore(s)).ToArray(); Scores = scores.OrderByDescending(s => scoreManager.GetTotalScore(s))
.ThenBy(s => s.OnlineScoreID)
.ToArray();
PlaceholderState = Scores.Any() ? PlaceholderState.Successful : PlaceholderState.NoScores; PlaceholderState = Scores.Any() ? PlaceholderState.Successful : PlaceholderState.NoScores;
return null; return null;
@ -182,7 +185,11 @@ namespace osu.Game.Screens.Select.Leaderboards
req.Success += r => req.Success += r =>
{ {
scoresCallback?.Invoke(r.Scores.Select(s => s.CreateScoreInfo(rulesets)).OrderByDescending(s => scoreManager.GetTotalScore(s))); scoresCallback?.Invoke(
r.Scores.Select(s => s.CreateScoreInfo(rulesets))
.OrderByDescending(s => scoreManager.GetTotalScore(s))
.ThenBy(s => s.OnlineScoreID));
TopScore = r.UserScore?.CreateScoreInfo(rulesets); TopScore = r.UserScore?.CreateScoreInfo(rulesets);
}; };