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

Merge branch 'network-play' into 'master'

Browse Source 
Network play

See merge request core-developers/forge!854
This commit is contained in:
Sol
2018-08-13 15:09:27 +00:00
parent a0803cfce6 2aa8d4bb1a
commit c45cf8df10
4 changed files with 81 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import forge.card.CardStateName;
import forge.game.card.CardFaceView;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Function;
@@ -160,18 +161,23 @@ public class GuiChoose {
if (sel instanceof InventoryItem) {
matchUI.setCard((InventoryItem) list.getSelectedValue());
return;
} else if (sel instanceof ICardFace) {
final ICardFace face = (ICardFace)sel;
PaperCard paper = FModel.getMagicDb().getCommonCards().getUniqueByName(face.getName());
} else if (sel instanceof ICardFace || sel instanceof CardFaceView) {
String faceName;
if (sel instanceof ICardFace) {
faceName = ((ICardFace) sel).getName();
} else {
faceName = ((CardFaceView) sel).getName();
}
PaperCard paper = FModel.getMagicDb().getCommonCards().getUniqueByName(faceName);
if (paper == null) {
paper = FModel.getMagicDb().getVariantCards().getUniqueByName(face.getName());
paper = FModel.getMagicDb().getVariantCards().getUniqueByName(faceName);
}
if (paper != null) {
Card c = Card.getCardForUi(paper);
boolean foundState = false;
for (CardStateName cs : c.getStates()) {
if (c.getState(cs).getName().equals(face.getName())) {
if (c.getState(cs).getName().equals(faceName)) {
foundState = true;
c.setState(cs, true);
matchUI.setCard(c.getView());