diff --git a/forge-game/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java index 13b0e80f5c4..c4056413197 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java @@ -24,6 +24,11 @@ public class PlaneswalkEffect extends SpellAbilityEffect { return; } + if (sa.hasParam("Optional") && !sa.getActivatingPlayer().getController().confirmAction(sa, null, + Localizer.getInstance().getMessage("lblWouldYouLikeToPlaneswalk"), null)) { + return; + } + final Map repParams = AbilityKey.mapFromAffected(activator); Object cause = sa.hasParam("Cause") ? sa.getParam("Cause") : sa; repParams.put(AbilityKey.Cause, cause); @@ -31,11 +36,6 @@ public class PlaneswalkEffect extends SpellAbilityEffect { return; } - if (sa.hasParam("Optional") && !sa.getActivatingPlayer().getController().confirmAction(sa, null, - Localizer.getInstance().getMessage("lblWouldYouLikeToPlaneswalk"), null)) { - return; - } - if (!sa.hasParam("DontPlaneswalkAway")) { for (Player p : game.getPlayers()) { p.leaveCurrentPlane();