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

Use the union of both players phase stops when Mindslavering an opponent

Browse Source
This commit is contained in:
friarsol
2020-06-28 22:29:40 -04:00
parent 7f5a56fe4f
commit ba1533e8e8
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
View File

@@ -85,8 +85,8 @@ import javax.swing.event.PopupMenuListener;
import java.awt.*; import java.awt.*;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.util.List;
import java.util.*; import java.util.*;
import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
@@ -1079,8 +1079,15 @@ public final class CMatchUI
@Override @Override
public boolean isUiSetToSkipPhase(final PlayerView playerTurn, final PhaseType phase) { public boolean isUiSetToSkipPhase(final PlayerView playerTurn, final PhaseType phase) {
PlayerView controlledPlayer = playerTurn.getMindSlaveMaster();
boolean skippedPhase = true;
if (controlledPlayer != null) {
final PhaseLabel controlledLabel = getFieldViewFor(controlledPlayer).getPhaseIndicator().getLabelFor(phase);
skippedPhase = controlledLabel != null && !controlledLabel.getEnabled();
}
final PhaseLabel label = getFieldViewFor(playerTurn).getPhaseIndicator().getLabelFor(phase); final PhaseLabel label = getFieldViewFor(playerTurn).getPhaseIndicator().getLabelFor(phase);
return label != null && !label.getEnabled(); return skippedPhase && label != null && !label.getEnabled();
} }
/** /**