From 15ea03bf7c53a41bd6085d8e29f88d3f3ec8767a Mon Sep 17 00:00:00 2001 From: drdev Date: Thu, 31 Jul 2014 19:41:27 +0000 Subject: [PATCH] Prevent altering default for desktop game --- forge-gui-mobile/src/forge/deck/FDeckEditor.java | 8 +------- .../main/java/forge/itemmanager/ItemManagerConfig.java | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java index 6af4b5877f9..660cbac01dd 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java +++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java @@ -747,13 +747,7 @@ public class FDeckEditor extends TabPageScreen { cardManager.setPool(cardpool); break; default: - if (cardManager.getConfig().getUniqueCardsOnly()) { - cardManager.setWantUnique(false); //prevent needing to perform logic to calculate uniqueness since we're passing a unique collection - cardManager.setPool(ItemPool.createFrom(FModel.getMagicDb().getCommonCards().getUniqueCards(), PaperCard.class), true); - } - else { - cardManager.setPool(ItemPool.createFrom(FModel.getMagicDb().getCommonCards().getAllCards(), PaperCard.class), true); - } + cardManager.setPool(ItemPool.createFrom(FModel.getMagicDb().getCommonCards().getUniqueCards(), PaperCard.class), true); break; } } diff --git a/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java b/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java index 52efe6959fe..bcd64f65121 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java +++ b/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java @@ -22,7 +22,7 @@ import org.w3c.dom.NodeList; public enum ItemManagerConfig { STRING_ONLY(SColumnUtil.getStringColumn(), false, false, true, null, null, 1, 0), - CARD_CATALOG(SColumnUtil.getCatalogDefaultColumns(true), true, true, false, + CARD_CATALOG(SColumnUtil.getCatalogDefaultColumns(true), true, false, false, null, null, 4, 0), DECK_EDITOR(SColumnUtil.getDeckEditorDefaultColumns(), false, false, true, GroupDef.DEFAULT, ColumnDef.CMC, 4, 1),