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

*Bring active players VField to the front. Helps keep track in 8 player games.

Browse Source
This commit is contained in:
Hellfish
2012-12-01 13:36:21 +00:00
parent 7392fd62c3
commit 8bca2e5727
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/forge/control/input/InputMulligan.java
View File

@@ -39,6 +39,7 @@ import forge.game.zone.ZoneType;
import forge.gui.framework.SDisplayUtil; import forge.gui.framework.SDisplayUtil;
import forge.gui.match.CMatchUI; import forge.gui.match.CMatchUI;
import forge.gui.match.VMatchUI; import forge.gui.match.VMatchUI;
import forge.gui.match.nonsingleton.VField;
import forge.gui.match.views.VMessage; import forge.gui.match.views.VMessage;
import forge.view.ButtonUtil; import forge.view.ButtonUtil;
/** /**
@@ -175,6 +176,12 @@ public class InputMulligan extends Input {
ga.checkStateEffects(); ga.checkStateEffects();
Singletons.getModel().getMatch().getInput().clearInput(); Singletons.getModel().getMatch().getInput().clearInput();
//Set Field shown to current player.
Player next = game.getPhaseHandler().getPlayerTurn();
VField nextField = CMatchUI.SINGLETON_INSTANCE.getFieldViewFor(next);
SDisplayUtil.showTab(nextField);
game.getPhaseHandler().nextPhase(); game.getPhaseHandler().nextPhase();
} }

9
src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -33,6 +33,9 @@ import forge.game.event.EndOfTurnEvent;
import forge.game.event.ManaBurnEvent; import forge.game.event.ManaBurnEvent;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.gui.framework.SDisplayUtil;
import forge.gui.match.CMatchUI;
import forge.gui.match.nonsingleton.VField;
import forge.properties.ForgePreferences.FPref; import forge.properties.ForgePreferences.FPref;
import forge.util.MyObservable; import forge.util.MyObservable;
@@ -528,7 +531,11 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
p.removeKeyword("Skip the untap step of this turn."); p.removeKeyword("Skip the untap step of this turn.");
} }
return getNextActivePlayer(); Player next = getNextActivePlayer();
VField nextField = CMatchUI.SINGLETON_INSTANCE.getFieldViewFor(next);
SDisplayUtil.showTab(nextField);
return next;
} }
/** /**