From a7a6a199e8dbc7b37831ce4cbe1b5fd0a84d3a4c Mon Sep 17 00:00:00 2001
From: Hellfish <hellfish@cardforge.org>
Date: Tue, 2 Apr 2013 20:15:14 +0000
Subject: [PATCH] *How did I misread the part about shuffling exiled cards back
 in after mulligan? Jeez.

---
 .../control/input/InputPartialParisMulligan.java     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/forge/control/input/InputPartialParisMulligan.java b/src/main/java/forge/control/input/InputPartialParisMulligan.java
index 8ae068d8033..4fa8d68e9eb 100644
--- a/src/main/java/forge/control/input/InputPartialParisMulligan.java
+++ b/src/main/java/forge/control/input/InputPartialParisMulligan.java
@@ -57,6 +57,7 @@ public class InputPartialParisMulligan extends InputBase {
     private final MatchController match;
     
     private final List<Card> lastExiled = new ArrayList<Card>();
+    private final List<Card> allExiled = new ArrayList<Card>();
     
     public InputPartialParisMulligan(MatchController match0, Player humanPlayer) {
         super(humanPlayer);
@@ -98,6 +99,7 @@ public class InputPartialParisMulligan extends InputBase {
         }
         
         player.drawCards(lastExiled.size()-1);
+        allExiled.addAll(lastExiled);
         lastExiled.clear();
 
         if (player.getCardsIn(ZoneType.Hand).isEmpty()) {
@@ -107,9 +109,15 @@ public class InputPartialParisMulligan extends InputBase {
         }
     }
 
-    final void end() {
-
+    final void end() {        
+        
         final GameState game = match.getCurrentGame();
+
+        for(Card c : allExiled)
+        {
+            game.action.moveToLibrary(c);
+        }
+        player.shuffle();
         
         // Computer mulligan
         //TODO: How should AI approach Partial Paris?