diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java index 2c71cfbc97b..f2859e6b1cb 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java @@ -362,7 +362,7 @@ public class NewTournamentDialog extends MageDialog { } while (packs.size() < numPacks) { JComboBox pack = new JComboBox(); - pack.setModel(new DefaultComboBoxModel(Sets.getInstance().getSortedByReleaseDate())); + pack.setModel(new DefaultComboBoxModel(Sets.getInstance().getWithBoosterSortedByReleaseDate())); pnlPacks.add(pack); packs.add(pack); pack.addActionListener(new java.awt.event.ActionListener() { diff --git a/Mage/src/mage/cards/ExpansionSet.java b/Mage/src/mage/cards/ExpansionSet.java index 1a56cdc6822..14eac7e2fc1 100644 --- a/Mage/src/mage/cards/ExpansionSet.java +++ b/Mage/src/mage/cards/ExpansionSet.java @@ -169,4 +169,8 @@ public abstract class ExpansionSet implements Serializable { } } } + + public boolean hasBoosters() { + return hasBoosters; + } } diff --git a/Mage/src/mage/cards/Sets.java b/Mage/src/mage/cards/Sets.java index 20254e1119f..655294a7bb0 100644 --- a/Mage/src/mage/cards/Sets.java +++ b/Mage/src/mage/cards/Sets.java @@ -28,6 +28,9 @@ package mage.cards; +import java.io.FileNotFoundException; +import java.io.PrintWriter; +import java.util.*; import mage.Constants.CardType; import mage.Constants.ColoredManaSymbol; import mage.cards.decks.DeckCardLists; @@ -37,9 +40,6 @@ import mage.cards.repository.CardRepository; import mage.util.ClassScanner; import org.apache.log4j.Logger; -import java.io.FileNotFoundException; -import java.io.PrintWriter; -import java.util.*; /** * @@ -182,4 +182,17 @@ public class Sets extends HashMap { }); return sets; } + + public ExpansionSet[] getWithBoosterSortedByReleaseDate() { + ExpansionSet[] allSets = getSortedByReleaseDate(); + ArrayList boosterSets = new ArrayList(); + for (ExpansionSet set: allSets) { + if (set.hasBoosters) { + boosterSets.add(set); + } + } + return boosterSets.toArray(new ExpansionSet[0]); + } + + }