h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 09:07:25 +08:00
Code Issues Releases Wiki Activity

Fix incorrect order after bans

Browse Source
This commit is contained in:
Dean Herbert 2018-11-11 00:48:22 +09:00
parent 629657044d
commit 976180ecc2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
View File

@ -103,6 +103,9 @@ namespace osu.Game.Tournament.Screens.MapPool
private void beatmapChanged(BeatmapInfo beatmap) private void beatmapChanged(BeatmapInfo beatmap)
{ {
if (currentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) < 2)
return;
if (beatmap.OnlineBeatmapID != null) if (beatmap.OnlineBeatmapID != null)
addForBeatmap(beatmap.OnlineBeatmapID.Value); addForBeatmap(beatmap.OnlineBeatmapID.Value);
} }
@ -126,7 +129,10 @@ namespace osu.Game.Tournament.Screens.MapPool
var nextColour = (currentMatch.Value.PicksBans.LastOrDefault()?.Team ?? roll_winner) == TeamColour.Red ? TeamColour.Blue : TeamColour.Red; var nextColour = (currentMatch.Value.PicksBans.LastOrDefault()?.Team ?? roll_winner) == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
setMode(nextColour, currentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= 2 ? ChoiceType.Pick : ChoiceType.Ban); if (pickType == ChoiceType.Ban && currentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= 2)
setMode(pickColour, ChoiceType.Pick);
else
setMode(nextColour, currentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= 2 ? ChoiceType.Pick : ChoiceType.Ban);
} }
protected override bool OnMouseDown(MouseDownEvent e) protected override bool OnMouseDown(MouseDownEvent e)