Merge pull request #20073 from peppy/fix-tournament-lookup

Fix tournament population failure when beatmap is not found on server
ppy · Sep 1, 2022 · e1e46ad · e1e46ad
2 parents 8b26527 + d3ae60e
commit e1e46ad
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/osu.Game.Tournament/Models/TournamentBeatmap.cs b/osu.Game.Tournament/Models/TournamentBeatmap.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Extensions;
 using osu.Game.Online.API.Requests.Responses;
@@ -41,7 +40,7 @@ public TournamentBeatmap(APIBeatmap beatmap)
             StarRating = beatmap.StarRating;
             Metadata = beatmap.Metadata;
             Difficulty = beatmap.Difficulty;
-            Covers = beatmap.BeatmapSet.AsNonNull().Covers;
+            Covers = beatmap.BeatmapSet?.Covers ?? new BeatmapSetOnlineCovers();
         }
 
         public bool Equals(IBeatmapInfo? other) => other is TournamentBeatmap b && this.MatchesOnlineID(b);

diff --git a/osu.Game/Beatmaps/BeatmapSetOnlineCovers.cs b/osu.Game/Beatmaps/BeatmapSetOnlineCovers.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using Newtonsoft.Json;
 
 namespace osu.Game.Beatmaps