From b2b2a4adafab9d6b1dd1d10675b78a629acd0d49 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jul 2022 04:06:48 +0300
Subject: [PATCH] Update tournament migration logic to check for null `Country`

---
 osu.Game.Tournament/Models/TournamentUser.cs | 3 ++-
 osu.Game.Tournament/TournamentGameBase.cs    | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Models/TournamentUser.cs b/osu.Game.Tournament/Models/TournamentUser.cs
index 80e58538e5..7faf6d1798 100644
--- a/osu.Game.Tournament/Models/TournamentUser.cs
+++ b/osu.Game.Tournament/Models/TournamentUser.cs
@@ -22,7 +22,8 @@ public class TournamentUser : IUser
         /// <summary>
         /// The player's country.
         /// </summary>
-        public Country? Country { get; set; }
+        [JsonProperty("country_code")]
+        public Country Country { get; set; }
 
         /// <summary>
         /// The player's global rank, or null if not available.
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index f2a35ea5b3..853ccec83c 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -186,7 +186,9 @@ private bool addPlayers()
         {
             var playersRequiringPopulation = ladder.Teams
                                                    .SelectMany(t => t.Players)
-                                                   .Where(p => string.IsNullOrEmpty(p.Username) || p.Rank == null).ToList();
+                                                   .Where(p => string.IsNullOrEmpty(p.Username)
+                                                               || p.Country == default
+                                                               || p.Rank == null).ToList();
 
             if (playersRequiringPopulation.Count == 0)
                 return false;