From a0192c0e47ee5964db076c0ccbc41527a7acae03 Mon Sep 17 00:00:00 2001 From: BetaSteward Date: Fri, 17 Jun 2011 10:29:50 -0400 Subject: [PATCH] fixed issue 160 --- .../BoosterDraftEliminationTournament.java | 2 +- .../plugins/mage-tournament-booster-draft.jar | Bin 5725 -> 5752 bytes Mage/src/mage/game/draft/BoosterDraft.java | 7 +++++-- Mage/src/mage/game/draft/DraftImpl.java | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftEliminationTournament.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftEliminationTournament.java index 9160fcccbd6..62678d66301 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftEliminationTournament.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftEliminationTournament.java @@ -54,7 +54,7 @@ public class BoosterDraftEliminationTournament extends TournamentSingleEliminati } protected void draft() { - Draft draft = new BoosterDraft((DraftOptions) options.getLimitedOptions()); + Draft draft = new BoosterDraft((DraftOptions) options.getLimitedOptions(), getSets()); for (TournamentPlayer player: players.values()) { draft.addPlayer(player.getPlayer()); } diff --git a/Mage.Server/plugins/mage-tournament-booster-draft.jar b/Mage.Server/plugins/mage-tournament-booster-draft.jar index 2fd3c301dba5ba29f044bf70035411625518dad1..f1656c3a7bc826a935edf98b91a5be36c28b5bab 100644 GIT binary patch delta 2440 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 BPy_$~ delta 2469 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 ZvJ&!c1d)yR3;;-NR8L_5U`bXG{Q=nbJ { - public BoosterDraft(DraftOptions options) { - super(options); + public BoosterDraft(DraftOptions options, List sets) { + super(options, sets); } @Override diff --git a/Mage/src/mage/game/draft/DraftImpl.java b/Mage/src/mage/game/draft/DraftImpl.java index c945f9b2419..ca5f62b61db 100644 --- a/Mage/src/mage/game/draft/DraftImpl.java +++ b/Mage/src/mage/game/draft/DraftImpl.java @@ -64,10 +64,11 @@ public abstract class DraftImpl> implements Draft { protected transient TableEventSource tableEventSource = new TableEventSource(); protected transient PlayerQueryEventSource playerQueryEventSource = new PlayerQueryEventSource(); - public DraftImpl(DraftOptions options) { + public DraftImpl(DraftOptions options, List sets) { id = UUID.randomUUID(); this.setCodes = options.getSetCodes(); this.timing = options.getTiming(); + this.sets = sets; } @Override