From 3e171f373e4fbc2b6d06eec754cc04857de7bf2e Mon Sep 17 00:00:00 2001 From: ssk97 Date: Mon, 24 Jun 2024 20:59:23 -0700 Subject: [PATCH] Fix Sorcerous Squall (#12519) wrong player chooses, is a "may" effect (implemented as "up to one") --- Mage.Sets/src/mage/cards/s/SorcerousSquall.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Mage.Sets/src/mage/cards/s/SorcerousSquall.java b/Mage.Sets/src/mage/cards/s/SorcerousSquall.java index 398c10c4d73..c998a191c88 100644 --- a/Mage.Sets/src/mage/cards/s/SorcerousSquall.java +++ b/Mage.Sets/src/mage/cards/s/SorcerousSquall.java @@ -71,17 +71,18 @@ class SorcerousSquallEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(source.getFirstTarget()); + Player player = game.getPlayer(source.getControllerId()); if (player == null) { return false; } FilterCard filter = new FilterInstantOrSorceryCard("instant or sorcery card from that player's graveyard"); filter.add(new OwnerIdPredicate(source.getFirstTarget())); - Target target = new TargetCardInGraveyard(1, 1, filter, true); - player.choose(outcome, target, source, game); - Effect effect = new MayCastTargetCardEffect(CastManaAdjustment.WITHOUT_PAYING_MANA_COST, true); - effect.setTargetPointer(new FixedTarget(target.getFirstTarget(), game)); - effect.apply(game, source); + Target target = new TargetCardInGraveyard(0, 1, filter, true); + if (player.choose(outcome, target, source, game)) { + Effect effect = new MayCastTargetCardEffect(CastManaAdjustment.WITHOUT_PAYING_MANA_COST, true); + effect.setTargetPointer(new FixedTarget(target.getFirstTarget(), game)); + effect.apply(game, source); + } return true; } }