From 04bcd5202eb112813a0d7ad30171ff8074eb7f21 Mon Sep 17 00:00:00 2001 From: Simisays <67333662+Simisays@users.noreply.github.com> Date: Sat, 4 Feb 2023 12:10:22 +0100 Subject: [PATCH] Update DestroyAllEffect.java --- .../java/forge/game/ability/effects/DestroyAllEffect.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/DestroyAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DestroyAllEffect.java index 6bbd81ece2f..c828ba730e5 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DestroyAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DestroyAllEffect.java @@ -52,7 +52,6 @@ public class DestroyAllEffect extends SpellAbilityEffect { final String desc = sa.getParamOrDefault("ValidDescription", ""); Player targetPlayer = sa.getTargets().getFirstTargetedPlayer(); - String valid = sa.getParamOrDefault("ValidCards", ""); // Ugh. If calculateAmount needs to be called with DestroyAll it _needs_ @@ -79,7 +78,9 @@ public class DestroyAllEffect extends SpellAbilityEffect { if (sa.hasParam("RememberAllObjects")) { card.addRemembered(list); } - + if (list.isEmpty() && isOptional) { + return; + } if (isOptional && !sa.getActivatingPlayer().getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblWouldYouLikeDestroy",(desc)), null)) { return;