Merge branch 'master' into headless-tournamentgamebase

This commit is contained in:
Dean Herbert
2020-06-12 10:51:37 +09:00
committed by GitHub
36 changed files with 90 additions and 77 deletions

View File

@ -66,11 +66,8 @@ namespace osu.Game.Tournament
ladder = JsonConvert.DeserializeObject<LadderInfo>(sr.ReadToEnd());
}
if (ladder == null)
ladder = new LadderInfo();
if (ladder.Ruleset.Value == null)
ladder.Ruleset.Value = RulesetStore.AvailableRulesets.First();
ladder ??= new LadderInfo();
ladder.Ruleset.Value ??= RulesetStore.AvailableRulesets.First();
Ruleset.BindTo(ladder.Ruleset);