From 8bca2e5727ca42df10b08dc208df66ee5b904ff0 Mon Sep 17 00:00:00 2001
From: Hellfish <hellfish@cardforge.org>
Date: Sat, 1 Dec 2012 13:36:21 +0000
Subject: [PATCH] *Bring active players VField to the front. Helps keep track
 in 8 player games.

---
 src/main/java/forge/control/input/InputMulligan.java | 7 +++++++
 src/main/java/forge/game/phase/PhaseHandler.java     | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/forge/control/input/InputMulligan.java b/src/main/java/forge/control/input/InputMulligan.java
index 9cbf98fe605..86c8b09bce0 100644
--- a/src/main/java/forge/control/input/InputMulligan.java
+++ b/src/main/java/forge/control/input/InputMulligan.java
@@ -39,6 +39,7 @@ import forge.game.zone.ZoneType;
 import forge.gui.framework.SDisplayUtil;
 import forge.gui.match.CMatchUI;
 import forge.gui.match.VMatchUI;
+import forge.gui.match.nonsingleton.VField;
 import forge.gui.match.views.VMessage;
 import forge.view.ButtonUtil;
  /**
@@ -175,6 +176,12 @@ public class InputMulligan extends Input {
 
         ga.checkStateEffects();
         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();
     }
 
diff --git a/src/main/java/forge/game/phase/PhaseHandler.java b/src/main/java/forge/game/phase/PhaseHandler.java
index 531de30acae..713b8ff20b4 100644
--- a/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/src/main/java/forge/game/phase/PhaseHandler.java
@@ -33,6 +33,9 @@ import forge.game.event.EndOfTurnEvent;
 import forge.game.event.ManaBurnEvent;
 import forge.game.player.Player;
 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.util.MyObservable;
 
@@ -528,7 +531,11 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
             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;
     }
 
     /**