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 lastExiled = new ArrayList(); + private final List allExiled = new ArrayList(); 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?