From 2e2c139f3e8f5fda84b855bec38243b1cac5266f Mon Sep 17 00:00:00 2001 From: Simisays <67333662+Simisays@users.noreply.github.com> Date: Sun, 5 Mar 2023 10:42:51 +0100 Subject: [PATCH] Update MakeCardEffect.java --- .../forge/game/ability/effects/MakeCardEffect.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java index 109aa1da1c0..09f32966c8c 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java @@ -43,6 +43,12 @@ public class MakeCardEffect extends SpellAbilityEffect { List faces = new ArrayList<>(); List pack = null; List names = Lists.newArrayList(); + + final String desc = sa.getParamOrDefault("OptionPrompt", ""); + if (sa.hasParam("Optional") && sa.hasParam("OptionPrompt") && //for now, OptionPrompt is needed + !player.getController().confirmAction(sa, null, Localizer.getInstance().getMessage(desc), null)) { + return; + } if (sa.hasParam("Name")) { final String n = sa.getParam("Name"); if (n.equals("ChosenName")) { @@ -118,11 +124,6 @@ public class MakeCardEffect extends SpellAbilityEffect { if (sa.hasParam("Tapped")) { card.setTapped(true); } - final String desc = sa.getParamOrDefault("OptionPrompt", ""); - if (sa.hasParam("Optional") && sa.hasParam("OptionPrompt") && //for now, OptionPrompt is needed - !player.getController().confirmAction(sa, null, Localizer.getInstance().getMessage(desc), null)) { - return; - } } } }