From c83a364e41896018912da74893d1e7235d80757e Mon Sep 17 00:00:00 2001 From: Agetian Date: Thu, 20 Dec 2018 08:51:17 +0300 Subject: [PATCH] - Fixed a bug which made the Qty and New columns disappear when switching between Main and Sideboard in quest deck editor. --- .../forge/screens/deckeditor/controllers/CEditorQuest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java index 84d8477f088..1d4bc47c248 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java @@ -392,16 +392,19 @@ public final class CEditorQuest extends CDeckEditor { //Fixes null pointer error on switching tabs while quest deck editor is open. TODO: Find source of bug possibly? if(sectionMode == null) sectionMode = DeckSection.Main; + final Map colOverridesCatalog = new HashMap(); + ItemTableColumn.addColOverride(ItemManagerConfig.QUEST_EDITOR_POOL, colOverridesCatalog, ColumnDef.NEW, this.questData.getCards().getFnNewCompare(), this.questData.getCards().getFnNewGet()); + //Based on which section the editor is in, display the remaining card pool (or applicable card pool if in //Commander) and the current section's cards switch(sectionMode){ case Main : - this.getCatalogManager().setup(ItemManagerConfig.CARD_CATALOG); + this.getCatalogManager().setup(ItemManagerConfig.QUEST_EDITOR_POOL, colOverridesCatalog); this.getCatalogManager().setPool(getRemainingCardPool()); this.getDeckManager().setPool(this.controller.getModel().getMain()); break; case Sideboard : - this.getCatalogManager().setup(ItemManagerConfig.CARD_CATALOG); + this.getCatalogManager().setup(ItemManagerConfig.QUEST_EDITOR_POOL, colOverridesCatalog); this.getCatalogManager().setPool(getRemainingCardPool()); this.getDeckManager().setPool(getDeck().getOrCreate(DeckSection.Sideboard)); break;