sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Convert TournamentTeam props to use binadbles

Browse Source
This commit is contained in:
Dean Herbert
2019-06-17 16:28:58 +09:00
parent e58d259498
commit 93fc14426b
17 changed files with 103 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,13 +100,13 @@ namespace osu.Game.Tournament
// assign teams
foreach (var pairing in ladder.Pairings)
{
pairing.Team1.Value = ladder.Teams.FirstOrDefault(t => t.Acronym == pairing.Team1Acronym);
pairing.Team2.Value = ladder.Teams.FirstOrDefault(t => t.Acronym == pairing.Team2Acronym);
pairing.Team1.Value = ladder.Teams.FirstOrDefault(t => t.Acronym.Value == pairing.Team1Acronym);
pairing.Team2.Value = ladder.Teams.FirstOrDefault(t => t.Acronym.Value == pairing.Team2Acronym);
foreach (var conditional in pairing.ConditionalPairings)
{
conditional.Team1.Value = ladder.Teams.FirstOrDefault(t => t.Acronym == conditional.Team1Acronym);
conditional.Team2.Value = ladder.Teams.FirstOrDefault(t => t.Acronym == conditional.Team2Acronym);
conditional.Team1.Value = ladder.Teams.FirstOrDefault(t => t.Acronym.Value == conditional.Team1Acronym);
conditional.Team2.Value = ladder.Teams.FirstOrDefault(t => t.Acronym.Value == conditional.Team2Acronym);
conditional.Grouping.Value = pairing.Grouping.Value;
}
}
@ -207,7 +207,7 @@ namespace osu.Game.Tournament
foreach (var t in ladder.Teams)
{
if (!string.IsNullOrEmpty(t.FullName))
if (!string.IsNullOrEmpty(t.FullName.Value))
continue;
var result = countries.FirstOrDefault(c => c.Acronym == t.Acronym);