h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 18:47:27 +08:00
Code Issues Releases Wiki Activity

Fix hard crashes on tournament client if a round contains an empty beatmap

Browse Source
This commit is contained in:
Dean Herbert 2020-01-19 22:26:15 +09:00
parent 3f2512295c
commit 55ed823c88
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game.Tournament/TournamentGameBase.cs
View File

@ -223,15 +223,22 @@ namespace osu.Game.Tournament
foreach (var r in ladder.Rounds)
{
foreach (var b in r.Beatmaps)
foreach (var b in r.Beatmaps.ToList())
{
if (b.BeatmapInfo == null && b.ID > 0)
if (b.BeatmapInfo == null)
{
var req = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = b.ID });
API.Perform(req);
b.BeatmapInfo = req.Result?.ToBeatmap(RulesetStore);
if (b.ID > 0)
{
var req = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = b.ID });
API.Perform(req);
b.BeatmapInfo = req.Result?.ToBeatmap(RulesetStore);
addedInfo = true;
addedInfo = true;
}
if (b.BeatmapInfo == null)
// if online population couldn't be performed, ensure we don't leave a null value behind
r.Beatmaps.Remove(b);
}
}
}