Some change to match timer (in progress).

Mage/src/mage/game/GameImpl.java

@@ -592,7 +592,9 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
     protected void init(UUID choosingPlayerId, GameOptions gameOptions) {
         for (Player player: state.getPlayers().values()) {
             player.beginTurn(this);
-            if (priorityTime > 0) {
+            // init only if match is with timer (>0) and time left was not set yet (== MAX_VALUE).
+            // otherwise the priorityTimeLeft is set in {@link MatchImpl.initGame)
+            if (priorityTime > 0 && player.getPriorityTimeLeft() == Integer.MAX_VALUE) {
                 initTimer(player.getId());
             }
         }

Mage/src/mage/game/match/MatchImpl.java

@@ -170,6 +170,10 @@ public abstract class MatchImpl implements Match {
                 game.loadCards(matchPlayer.getDeck().getCards(), matchPlayer.getPlayer().getId());
                 game.loadCards(matchPlayer.getDeck().getSideboard(), matchPlayer.getPlayer().getId());
                 game.addPlayer(matchPlayer.getPlayer(), matchPlayer.getDeck());
+                // set the priority time left for the match
+                if (matchPlayer.getPriorityTimeLeft() > 0) {
+                    matchPlayer.getPlayer().setPriorityTimeLeft(matchPlayer.getPriorityTimeLeft());
+                }
             }
         }
         game.setPriorityTime(options.getPriorityTime());
@@ -185,6 +189,10 @@ public abstract class MatchImpl implements Match {
         for (MatchPlayer player: this.players) {
             Player p = game.getPlayer(player.getPlayer().getId());
             if (p != null) {
+                // get the left time from player priority timer
+                if (game.getPriorityTime() > 0) {
+                    player.setPriorityTimeLeft(p.getPriorityTimeLeft());
+                }
                 if (p.hasQuitted()) {
                     player.setQuitted(true);
                 }

Mage/src/mage/game/match/MatchPlayer.java

@@ -44,6 +44,7 @@ public class MatchPlayer {
     private Player player;
     private boolean quitted;
     private boolean doneSideboarding;
+    private int priorityTimeLeft;
 
     public MatchPlayer(Player player, Deck deck) {
         this.player = player;
@@ -54,6 +55,14 @@ public class MatchPlayer {
         this.quitted = false;
     }
 
+    public int getPriorityTimeLeft() {
+        return priorityTimeLeft;
+    }
+
+    public void setPriorityTimeLeft(int priorityTimeLeft) {
+        this.priorityTimeLeft = priorityTimeLeft;
+    }
+
     public int getWins() {
         return wins;
     }

Mage/src/mage/players/PlayerImpl.java

@@ -231,7 +231,7 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
         
         this.passedTurn = player.passedTurn;
         this.passedAllTurns = player.passedAllTurns;
-
+        this.priorityTimeLeft = player.getPriorityTimeLeft();
     }
 
     @Override
@@ -278,7 +278,7 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
 
         this.turnController = player.getTurnControlledBy();
         this.passed = player.isPassed();
-
+        this.priorityTimeLeft = player.getPriorityTimeLeft();
     }
 
     @Override