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

Fix card display in multiple-zone selection list (eg Scavenging Ooze's ability).

Browse Source
This commit is contained in:
elcnesh
2015-02-23 11:00:32 +00:00
parent 5a0531b045
commit aa5529a4b0
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java
View File

@@ -20,6 +20,7 @@ import com.google.common.base.Function;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import forge.FThreads; import forge.FThreads;
import forge.game.card.Card;
import forge.game.card.CardView; import forge.game.card.CardView;
import forge.game.card.CardView.CardStateView; import forge.game.card.CardView.CardStateView;
import forge.item.InventoryItem; import forge.item.InventoryItem;
@@ -218,16 +219,16 @@ public class GuiChoose {
card = ((CardStateView) sel).getCard(); card = ((CardStateView) sel).getCard();
} else if (sel instanceof CardView) { } else if (sel instanceof CardView) {
card = (CardView) sel; card = (CardView) sel;
} else if (sel instanceof Card) {
card = CardView.get((Card) sel);
} else { } else {
card = null; card = null;
} }
if (card != null) {
matchUI.setCard(card);
matchUI.setCard(card);
matchUI.clearPanelSelections(); matchUI.clearPanelSelections();
matchUI.setPanelSelection(card); matchUI.setPanelSelection(card);
} }
}
}); });
} }