From 5c6fb2d2798d67864a2f37c7aded240b8a2acb15 Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Wed, 29 May 2013 19:16:19 +0000
Subject: [PATCH] concede on mulligan handled

---
 src/main/java/forge/game/GameAction.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/forge/game/GameAction.java b/src/main/java/forge/game/GameAction.java
index 5f8e9985765..42a4a087e32 100644
--- a/src/main/java/forge/game/GameAction.java
+++ b/src/main/java/forge/game/GameAction.java
@@ -1545,7 +1545,11 @@ public class GameAction {
                 if( hasKept[i]) continue;
                 
                 Player p = whoCanMulligan.get(i);
-                List<Card> toMulligan = p.canMulligan() ? p.getController().getCardsToMulligan(isCommander, firstPlayer) : null; 
+                List<Card> toMulligan = p.canMulligan() ? p.getController().getCardsToMulligan(isCommander, firstPlayer) : null;
+                
+                if ( game.isGameOver()) // conceded on mulligan prompt
+                    return; 
+                
                 if ( toMulligan != null && !toMulligan.isEmpty()) {
                     if( !isCommander ) {
                         toMulligan = new ArrayList<Card>(p.getCardsIn(ZoneType.Hand));