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

Don't switch to Combat pane unless an attacker is declared

Browse Source
This commit is contained in:
drdev
2013-11-29 04:37:35 +00:00
parent 8acdc6c458
commit afbcd90ffc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/gui/match/CMatchUI.java
View File

@@ -297,7 +297,7 @@ public enum CMatchUI implements ICDoc, IMenuProvider {
} }
public void showCombat(Combat combat) { public void showCombat(Combat combat) {
if (combat != null && combat.getAttackingPlayer().getGame().getStack().isEmpty()) { if (combat != null && combat.getAttackers().size() > 0 && combat.getAttackingPlayer().getGame().getStack().isEmpty()) {
if (selectedDocBeforeCombat == null) { if (selectedDocBeforeCombat == null) {
IVDoc<? extends ICDoc> combatDoc = EDocID.REPORT_COMBAT.getDoc(); IVDoc<? extends ICDoc> combatDoc = EDocID.REPORT_COMBAT.getDoc();
if (combatDoc.getParentCell() != null) { if (combatDoc.getParentCell() != null) {

6
forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java
View File

@@ -17,7 +17,6 @@
*/ */
package forge.gui.match.controllers; package forge.gui.match.controllers;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import forge.Command; import forge.Command;
@@ -25,6 +24,7 @@ import forge.Singletons;
import forge.game.card.Card; import forge.game.card.Card;
import forge.gui.framework.ICDoc; import forge.gui.framework.ICDoc;
import forge.gui.match.views.VDetail; import forge.gui.match.views.VDetail;
import forge.gui.toolbox.FMouseAdapter;
import forge.item.IPaperCard; import forge.item.IPaperCard;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.item.InventoryItemFromSet; import forge.item.InventoryItemFromSet;
@@ -69,9 +69,9 @@ public enum CDetail implements ICDoc {
@Override @Override
public void initialize() { public void initialize() {
view.getPnlDetail().addMouseListener(new MouseAdapter() { view.getPnlDetail().addMouseListener(new FMouseAdapter() {
@Override @Override
public void mouseClicked(final MouseEvent e) { public void onLeftClick(final MouseEvent e) {
CPicture.SINGLETON_INSTANCE.flipCard(); CPicture.SINGLETON_INSTANCE.flipCard();
} }
}); });