Merge remote-tracking branch 'upstream/master' into tournament-tools

This commit is contained in:
Dean Herbert
2019-05-15 12:08:23 +09:00
477 changed files with 7058 additions and 3496 deletions

View File

@ -148,6 +148,7 @@ namespace osu.Game.Tournament.Screens.MapPool
else
{
var existing = currentMatch.Value.PicksBans.FirstOrDefault(p => p.BeatmapID == map.Beatmap.OnlineBeatmapID);
if (existing != null)
{
currentMatch.Value.PicksBans.Remove(existing);