From 724e4e87acd0f4c86f8d263918b9605c25ff0d31 Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Wed, 29 May 2013 19:02:04 +0000
Subject: [PATCH] a couple of checks to concede correctly during 'play or draw'
 and mulligan prompts

---
 src/main/java/forge/game/GameAction.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/forge/game/GameAction.java b/src/main/java/forge/game/GameAction.java
index 12a5ea735c5..5f8e9985765 100644
--- a/src/main/java/forge/game/GameAction.java
+++ b/src/main/java/forge/game/GameAction.java
@@ -1478,6 +1478,8 @@ public class GameAction {
     public void startGame(final Player firstPlayer) {
         Player first = firstPlayer;
         do { 
+            if ( game.isGameOver() ) break; // conceded during "play or draw"
+
             // Draw <handsize> cards
             for (final Player p1 : game.getPlayers()) {
                 p1.drawCards(p1.getMaxHandSize());
@@ -1486,10 +1488,12 @@ public class GameAction {
             game.setAge(GameAge.Mulligan);
             performMulligans(first, game.getType() == GameType.Commander);
             
+            if ( game.isGameOver() ) break; // conceded during "mulligan" prompt
+
             // should I restore everyting exiled by Karn here, or before Mulligans is fine?  
-            
+
             game.setAge(GameAge.Play);
-            
+
             // THIS CODE WILL WORK WITH PHASE = NULL {
                 if(game.getType() == GameType.Planechase)
                     firstPlayer.initPlane();