From 3bb913b4fc4fa0df14da7b7d05a912d0f457fdfc Mon Sep 17 00:00:00 2001 From: Sol Date: Tue, 9 Aug 2016 02:06:36 +0000 Subject: [PATCH] - Fixed issue with single set Fantasy Blocks --- .../src/main/java/forge/limited/BoosterDraft.java | 12 ++++++------ forge-gui/src/main/java/forge/model/CardBlock.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/forge-gui/src/main/java/forge/limited/BoosterDraft.java b/forge-gui/src/main/java/forge/limited/BoosterDraft.java index e80a6d612a9..b66c9dfb106 100644 --- a/forge-gui/src/main/java/forge/limited/BoosterDraft.java +++ b/forge-gui/src/main/java/forge/limited/BoosterDraft.java @@ -95,11 +95,6 @@ public class BoosterDraft implements IBoosterDraft { if (block == null) { return false; } final List cardSets = block.getSets(); - if (cardSets.isEmpty()) { - SOptionPane.showErrorDialog(block.toString() + " does not contain any set combinations."); - return false; - } - final Stack sets = new Stack<>(); for (int k = cardSets.size() - 1; k >= 0; k--) { sets.add(cardSets.get(k).getCode()); @@ -111,6 +106,11 @@ public class BoosterDraft implements IBoosterDraft { } } + if (sets.isEmpty()) { + SOptionPane.showErrorDialog(block.toString() + " does not contain any set combinations."); + return false; + } + final int nPacks = block.getCntBoostersDraft(); if (sets.size() > 1) { @@ -279,7 +279,7 @@ public class BoosterDraft implements IBoosterDraft { } public void addSingleBoosterPack(int player, boolean random) { - // TODO Cogwork Librarian + // TODO Lore Seeker } // size 7, all the computers decks diff --git a/forge-gui/src/main/java/forge/model/CardBlock.java b/forge-gui/src/main/java/forge/model/CardBlock.java index 730516590b3..78c7bcc06e4 100644 --- a/forge-gui/src/main/java/forge/model/CardBlock.java +++ b/forge-gui/src/main/java/forge/model/CardBlock.java @@ -226,7 +226,7 @@ public final class CardBlock implements Comparable { /** * TODO: Write javadoc for Constructor. * @param pathname - * @param keySelector0 + * @param editions0 */ public Reader(String pathname, CardEdition.Collection editions0) { super(pathname, CardBlock.FN_GET_NAME); @@ -255,7 +255,7 @@ public final class CardBlock implements Comparable { String metaSpec = set.substring(5); boolean noDraft = metaSpec.startsWith("NoDraft-"); if( noDraft ) metaSpec = metaSpec.substring(8); - metas.add(new MetaSet(metaSpec, noDraft)); + metas.add(new MetaSet(metaSpec, !noDraft)); } else { sets.add(editions.getEditionByCodeOrThrow(set)); }