external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Fixed a bug which made the Qty and New columns disappear in Quest Deck Editor.

See merge request core-developers/forge!1238
This commit is contained in:
Michael Kamensky
2018-12-20 05:52:02 +00:00
parent 935db635c9 c83a364e41
commit 95d9f07900
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
View File

@@ -392,16 +392,19 @@ public final class CEditorQuest extends CDeckEditor<Deck> {
//Fixes null pointer error on switching tabs while quest deck editor is open. TODO: Find source of bug possibly? //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; if(sectionMode == null) sectionMode = DeckSection.Main;
final Map<ColumnDef, ItemTableColumn> colOverridesCatalog = new HashMap<ColumnDef, ItemTableColumn>();
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 //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 //Commander) and the current section's cards
switch(sectionMode){ switch(sectionMode){
case Main : case Main :
this.getCatalogManager().setup(ItemManagerConfig.CARD_CATALOG); this.getCatalogManager().setup(ItemManagerConfig.QUEST_EDITOR_POOL, colOverridesCatalog);
this.getCatalogManager().setPool(getRemainingCardPool()); this.getCatalogManager().setPool(getRemainingCardPool());
this.getDeckManager().setPool(this.controller.getModel().getMain()); this.getDeckManager().setPool(this.controller.getModel().getMain());
break; break;
case Sideboard : case Sideboard :
this.getCatalogManager().setup(ItemManagerConfig.CARD_CATALOG); this.getCatalogManager().setup(ItemManagerConfig.QUEST_EDITOR_POOL, colOverridesCatalog);
this.getCatalogManager().setPool(getRemainingCardPool()); this.getCatalogManager().setPool(getRemainingCardPool());
this.getDeckManager().setPool(getDeck().getOrCreate(DeckSection.Sideboard)); this.getDeckManager().setPool(getDeck().getOrCreate(DeckSection.Sideboard));
break; break;