From 4d4a7f0b23f9a2785d3ad8841f3404aee4bdde17 Mon Sep 17 00:00:00 2001 From: Hanmac Date: Thu, 18 Aug 2016 08:18:43 +0000 Subject: [PATCH] GuiChoose: add logic to display ICardFace objects (it checks for PaperCard) --- forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java b/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java index b9344e0591b..f7651d69f59 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java +++ b/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java @@ -18,10 +18,13 @@ import org.apache.commons.lang3.StringUtils; import com.google.common.base.Function; import forge.FThreads; +import forge.card.ICardFace; import forge.game.card.Card; import forge.game.card.CardView; import forge.game.card.CardView.CardStateView; import forge.item.InventoryItem; +import forge.item.PaperCard; +import forge.model.FModel; import forge.screens.match.CMatchUI; import forge.toolbox.FOptionPane; @@ -156,6 +159,11 @@ public class GuiChoose { if (sel instanceof InventoryItem) { matchUI.setCard((InventoryItem) list.getSelectedValue()); return; + } else if (sel instanceof ICardFace) { + final ICardFace face = (ICardFace)sel; + final PaperCard paper = FModel.getMagicDb().getAllCards().getUniqueByName(face.getName()); + matchUI.setCard(paper); + return; } final CardView card;