Game: fixed mulligan's copy code (can potentially fix empty hands or loses on game start in rare use cases, e.g. with AI);

Mage.Tests/src/test/java/org/mage/test/mulligan/LondonMulliganTest.java

@@ -390,5 +390,4 @@ public class LondonMulliganTest extends MulliganTestBase {
             scenario.assertSizes(0, 40);
         });
     }
-
 }

Mage/src/main/java/mage/game/mulligan/CanadianHighlanderMulligan.java

@@ -15,9 +15,10 @@ public class CanadianHighlanderMulligan extends VancouverMulligan {
         super(freeMulligans);
     }
 
-    @Override
+    CanadianHighlanderMulligan(final CanadianHighlanderMulligan mulligan) {
-    public CanadianHighlanderMulligan copy() {
+        super(mulligan);
-        return new CanadianHighlanderMulligan(getFreeMulligans());
+
+        this.usedMulligans.putAll(mulligan.usedMulligans);
     }
 
     private String getNextMulligan(String mulligan) {
@@ -116,9 +117,13 @@ public class CanadianHighlanderMulligan extends VancouverMulligan {
         }
         game.fireInformEvent(new StringBuilder(player.getLogName())
                 .append(" mulligans to ")
-                .append(Integer.toString(numToMulliganTo))
+                .append(numToMulliganTo)
                 .append(numToMulliganTo == 1 ? " card" : " cards").toString());
         player.drawCards(numToMulliganTo, null, game);
     }
 
+    @Override
+    public CanadianHighlanderMulligan copy() {
+        return new CanadianHighlanderMulligan(this);
+    }
 }

Mage/src/main/java/mage/game/mulligan/LondonMulligan.java

@@ -21,6 +21,13 @@ public class LondonMulligan extends Mulligan {
         super(freeMulligans);
     }
 
+    LondonMulligan(final LondonMulligan mulligan) {
+        super(mulligan);
+
+        this.startingHandSizes.putAll(mulligan.startingHandSizes);
+        this.openingHandSizes.putAll(mulligan.openingHandSizes);
+    }
+
     @Override
     public void executeMulliganPhase(Game game, int startingHandSize) {
         /*
@@ -115,9 +122,6 @@ public class LondonMulligan extends Mulligan {
 
     @Override
     public LondonMulligan copy() {
-        LondonMulligan mulligan = new LondonMulligan(getFreeMulligans());
+        return new LondonMulligan(this);
-        mulligan.openingHandSizes.putAll(openingHandSizes);
-        mulligan.startingHandSizes.putAll(startingHandSizes);
-        return mulligan;
     }
 }

Mage/src/main/java/mage/game/mulligan/Mulligan.java

@@ -16,6 +16,12 @@ public abstract class Mulligan implements Serializable {
         this.freeMulligans = freeMulligans;
     }
 
+    Mulligan(final Mulligan mulligan) {
+        super();
+        this.freeMulligans = mulligan.freeMulligans;
+        this.usedFreeMulligans.putAll(mulligan.usedFreeMulligans);
+    }
+
     public void executeMulliganPhase(Game game, int startingHandSize) {
         /*
          * 103.4. Each player draws a number of cards equal to their starting hand size,

Mage/src/main/java/mage/game/mulligan/ParisMulligan.java

@@ -11,6 +11,10 @@ public class ParisMulligan extends Mulligan {
         super(freeMulligans);
     }
 
+    ParisMulligan(final ParisMulligan mulligan) {
+        super(mulligan);
+    }
+
     @Override
     public int mulliganDownTo(Game game, UUID playerId) {
         Player player = game.getPlayer(playerId);
@@ -57,11 +61,11 @@ public class ParisMulligan extends Mulligan {
     }
 
     @Override
-    public void endMulligan(Game game, UUID playerId) {}
+    public void endMulligan(Game game, UUID playerId) {
+    }
 
     @Override
     public ParisMulligan copy() {
-        return new ParisMulligan(getFreeMulligans());
+        return new ParisMulligan(this);
     }
-
 }

Mage/src/main/java/mage/game/mulligan/VancouverMulligan.java

@@ -11,6 +11,10 @@ public class VancouverMulligan extends ParisMulligan {
         super(freeMulligans);
     }
 
+    VancouverMulligan(final VancouverMulligan mulligan) {
+        super(mulligan);
+    }
+
     @Override
     public void executeMulliganPhase(Game game, int startingHandSize) {
         super.executeMulliganPhase(game, startingHandSize);
@@ -30,7 +34,6 @@ public class VancouverMulligan extends ParisMulligan {
 
     @Override
     public VancouverMulligan copy() {
-        return new VancouverMulligan(getFreeMulligans());
+        return new VancouverMulligan(this);
     }
-
 }