From 0bd937f40a744e09aa3c7c3067602eafc9b3cb7e Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 04:56:35 +0000 Subject: [PATCH] Fixed the cut to card returning back to the library if it was in the opening hand. --- src/forge/GameAction.java | 4 +++- src/forge/Input_Mulligan.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java index c9ed9b5dae2..25cf8dfc614 100644 --- a/src/forge/GameAction.java +++ b/src/forge/GameAction.java @@ -1368,7 +1368,9 @@ public class GameAction { return; } Cut_Count = Cut_Count + 1; - + AllZone.GameAction.moveTo(AllZone.getZone(Constant.Zone.Library, Constant.Player.Human),AllZone.GameAction.HumanCut); + AllZone.GameAction.moveTo(AllZone.getZone(Constant.Zone.Library, Constant.Player.Computer),AllZone.GameAction.ComputerCut); + StringBuilder sb = new StringBuilder(); sb.append("Human cut his / her deck to : " + HumanCut.getName() + " (" + HumanCut.getManaCost() + ")" + "\r\n"); sb.append("Computer cut his / her deck to : " + ComputerCut.getName() + " (" + ComputerCut.getManaCost() + ")" + "\r\n"); diff --git a/src/forge/Input_Mulligan.java b/src/forge/Input_Mulligan.java index 001845d4abd..a0b05977557 100644 --- a/src/forge/Input_Mulligan.java +++ b/src/forge/Input_Mulligan.java @@ -83,7 +83,8 @@ public class Input_Mulligan extends Input { } } - if(AllZone.GameAction.Start_Cut == true) { + if(AllZone.GameAction.Start_Cut == true && !(HHandList.contains(AllZone.GameAction.HumanCut) + || CHandList.contains(AllZone.GameAction.ComputerCut))) { AllZone.GameAction.moveTo(AllZone.getZone(Constant.Zone.Library, Constant.Player.Human),AllZone.GameAction.HumanCut); AllZone.GameAction.moveTo(AllZone.getZone(Constant.Zone.Library, Constant.Player.Computer),AllZone.GameAction.ComputerCut); }