From 108abbe16c7ae72425a0954fdf05b28ce60ba8aa Mon Sep 17 00:00:00 2001 From: Michael Kamensky Date: Tue, 28 May 2019 12:08:19 +0000 Subject: [PATCH] Vancouver mulligan only allows to scry if the mulligan actually happened --- .../src/main/java/forge/game/mulligan/VancouverMulligan.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/mulligan/VancouverMulligan.java b/forge-game/src/main/java/forge/game/mulligan/VancouverMulligan.java index 17949c2691b..6e02409fc54 100644 --- a/forge-game/src/main/java/forge/game/mulligan/VancouverMulligan.java +++ b/forge-game/src/main/java/forge/game/mulligan/VancouverMulligan.java @@ -2,6 +2,7 @@ package forge.game.mulligan; import com.google.common.collect.ImmutableList; import forge.game.player.Player; +import forge.game.zone.ZoneType; public class VancouverMulligan extends ParisMulligan { public VancouverMulligan(Player p, boolean firstMullFree) { @@ -10,6 +11,8 @@ public class VancouverMulligan extends ParisMulligan { public void afterMulligan() { super.afterMulligan(); - player.getGame().getAction().scry(ImmutableList.of(player), 1, null); + if (player.getStartingHandSize() > player.getZone(ZoneType.Hand).size()) { + player.getGame().getAction().scry(ImmutableList.of(player), 1, null); + } } }