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

- GuiChoose will no longer reference CardFactory.

Browse Source
This commit is contained in:
Sloth
2013-05-07 16:07:58 +00:00
parent f7d8fd81ff
commit 1979e83edb
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/forge/gui/GuiChoose.java
View File

@@ -18,10 +18,8 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener; import javax.swing.event.ListSelectionListener;
import forge.Card; import forge.Card;
import forge.CardCharacteristicName;
import forge.FThreads; import forge.FThreads;
import forge.Singletons; import forge.Singletons;
import forge.card.cardfactory.CardFactory;
import forge.gui.match.CMatchUI; import forge.gui.match.CMatchUI;
import forge.item.InventoryItem; import forge.item.InventoryItem;
@@ -122,16 +120,14 @@ public class GuiChoose {
public void valueChanged(final ListSelectionEvent ev) { public void valueChanged(final ListSelectionEvent ev) {
if (list.getSelectedValue() instanceof Card) { if (list.getSelectedValue() instanceof Card) {
Card card = (Card) list.getSelectedValue(); Card card = (Card) list.getSelectedValue();
if (card.isFaceDown()) { if (card.isFaceDown() && card.canBeShownTo(Singletons.getControl().getPlayer())) {
if (card.canBeShownTo(Singletons.getControl().getLobby().getGuiPlayer().getPlayer(card.getGame()))) { CMatchUI.SINGLETON_INSTANCE.setCard(card, true);
card = CardFactory.copyCard(card); } else {
card.setState(CardCharacteristicName.Original);
}
}
CMatchUI.SINGLETON_INSTANCE.setCard(card); CMatchUI.SINGLETON_INSTANCE.setCard(card);
}
GuiUtils.clearPanelSelections(); GuiUtils.clearPanelSelections();
GuiUtils.setPanelSelection((Card) list.getSelectedValue()); GuiUtils.setPanelSelection(card);
} }
if (list.getSelectedValue() instanceof InventoryItem) { if (list.getSelectedValue() instanceof InventoryItem) {
CMatchUI.SINGLETON_INSTANCE.setCard((InventoryItem) list.getSelectedValue()); CMatchUI.SINGLETON_INSTANCE.setCard((InventoryItem) list.getSelectedValue());