From cc2464cdbcdb0c3d1f3ccc6081c0a07dd65ceeac Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 12 Jul 2014 21:28:47 +0000 Subject: [PATCH] Fix so inventory updated when cards added/removed from deck --- .../src/forge/deck/FDeckEditor.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java index 9dee44df820..24c41bb275a 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java +++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java @@ -700,7 +700,7 @@ public class FDeckEditor extends TabPageScreen { @Override protected boolean canAddCards() { - return false; + return !cardManager.isInfinite(); } protected String getItemManagerCaption() { @@ -726,9 +726,9 @@ public class FDeckEditor extends TabPageScreen { } public void refresh() { - if (!isVisible()) { + if (!isVisible() && cardManager.isInfinite()) { needRefreshWhenShown = true; - return; //delay refreshing while hidden + return; //delay refreshing while hidden for infinite card managers } switch (parentScreen.getEditorType()) { case Archenemy: @@ -754,6 +754,9 @@ public class FDeckEditor extends TabPageScreen { @Override protected void onCardActivated(PaperCard card) { + if (!cardManager.isInfinite()) { + removeCard(card); + } parentScreen.getMainDeckPage().addCard(card); } @@ -764,6 +767,9 @@ public class FDeckEditor extends TabPageScreen { public void run(Integer result) { if (result == null || result <= 0) { return; } + if (!cardManager.isInfinite()) { + removeCard(card, result); + } parentScreen.getMainDeckPage().addCard(card, result); } }); @@ -772,7 +778,10 @@ public class FDeckEditor extends TabPageScreen { @Override public void run(Integer result) { if (result == null || result <= 0) { return; } - + + if (!cardManager.isInfinite()) { + removeCard(card, result); + } parentScreen.getSideboardPage().addCard(card, result); } }); @@ -784,6 +793,9 @@ public class FDeckEditor extends TabPageScreen { public void run(Integer result) { if (result == null || result <= 0) { return; } + if (!cardManager.isInfinite()) { + removeCard(card); + } CardPool newPool = new CardPool(); newPool.add(card); parentScreen.getCommanderPage().setCards(newPool);