From a9cc7cefd09407a70ef2e202b1005d40689d7f5c Mon Sep 17 00:00:00 2001 From: Grath <1895280+Grath@users.noreply.github.com> Date: Mon, 2 Aug 2021 18:55:34 -0400 Subject: [PATCH] * Zaffai, Thunder Conductor - fixed that it allows to choose opponent instead random (#8094) * Fix Zaffai: Target opponent should be at random. Co-authored-by: Oleg Agafonov --- .../src/mage/cards/z/ZaffaiThunderConductor.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/cards/z/ZaffaiThunderConductor.java b/Mage.Sets/src/mage/cards/z/ZaffaiThunderConductor.java index 45b20aaeba..d6f2867456 100644 --- a/Mage.Sets/src/mage/cards/z/ZaffaiThunderConductor.java +++ b/Mage.Sets/src/mage/cards/z/ZaffaiThunderConductor.java @@ -70,19 +70,25 @@ class ZaffaiThunderConductorEffect extends OneShotEffect { if (player == null) { return false; } + player.scry(1, source, game); Spell spell = (Spell) getValue(MagecraftAbility.SPELL_KEY); if (spell == null || spell.getManaValue() < 5) { - return false; + return true; } + new Elemental44Token().putOntoBattlefield(1, game, source, source.getControllerId()); if (spell.getManaValue() < 10) { return true; } + TargetOpponent target = new TargetOpponent(true); - player.chooseTarget(outcome, target, source, game); + target.setRandom(true); + target.chooseTarget(Outcome.Damage, player.getId(), source, game); Player opponent = game.getPlayer(target.getFirstTarget()); - opponent.damage(10, source.getSourceId(), source, game); + if (opponent != null) { + opponent.damage(10, source.getSourceId(), source, game); + } return true; } }