From 4dbe4f159973e4a7893b6b24c097e8c6297d9cec Mon Sep 17 00:00:00 2001 From: Klisz Date: Wed, 6 Dec 2023 23:58:16 -0700 Subject: [PATCH] Update PlaneswalkEffect.java (#4315) Fixes an issue where planeswalk replacements were being applied before confirmation for optional planeswalks, thus making it so that one couldn't choose not to planeswalk with TARDIS's attack trigger if one also controls Susan Foreman --- .../forge/game/ability/effects/PlaneswalkEffect.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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();