diff --git a/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java b/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java index 4971947b285..f451bbef7fb 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java +++ b/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java @@ -92,14 +92,17 @@ class CyclopsGladiatorEffect extends OneShotEffect { filter.getControllerId().add(defenderId); TargetCreaturePermanent target = new TargetCreaturePermanent(filter); Player player = game.getPlayer(source.getControllerId()); - player.choose(Outcome.Damage, target, game); - Permanent permanent = game.getPermanent(target.getFirstTarget()); - Permanent cyclops = game.getPermanent(source.getSourceId()); - if (permanent != null && cyclops != null) { - permanent.damage(cyclops.getPower().getValue(), cyclops.getId(), game, true, false); - cyclops.damage(permanent.getPower().getValue(), permanent.getId(), game, true, false); - return true; - } + if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) { + if (player.chooseTarget(Outcome.Detriment, target, source, game)) { + Permanent permanent = game.getPermanent(target.getFirstTarget()); + Permanent cyclops = game.getPermanent(source.getSourceId()); + if (permanent != null && cyclops != null) { + permanent.damage(cyclops.getPower().getValue(), cyclops.getId(), game, true, false); + cyclops.damage(permanent.getPower().getValue(), permanent.getId(), game, true, false); + return true; + } + } + } } return false; } diff --git a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java index f22ba3c033c..f05a09991e3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java +++ b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java @@ -161,8 +161,8 @@ class NecroticPlagueEffect2 extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { TargetCreaturePermanent target = new TargetCreaturePermanent(filter); - if (target.canChoose(source.getControllerId(), game)) { - if (controller.choose(Outcome.Detriment, target, game)) { + if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) { + if (controller.chooseTarget(Outcome.Detriment, target, source, game)) { Card card = game.getCard(cardId); if (card != null) { card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getId(), source.getControllerId()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java index 2155b35efa7..967b6ef186b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java @@ -85,20 +85,21 @@ class GoblinArsonistEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { TargetCreatureOrPlayer target = new TargetCreatureOrPlayer(); Player player = game.getPlayer(source.getControllerId()); - player.choose(Outcome.Damage, target, game); + if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) { + player.chooseTarget(Outcome.Damage, target, source, game); - Permanent permanent = game.getPermanent(target.getFirstTarget()); - if (permanent != null) { - permanent.damage(1, source.getSourceId(), game, true, false); - return true; - } - - Player targetPlayer = game.getPlayer(target.getFirstTarget()); - if (targetPlayer != null) { - targetPlayer.damage(1, source.getSourceId(), game, true, false); - return true; - } + Permanent permanent = game.getPermanent(target.getFirstTarget()); + if (permanent != null) { + permanent.damage(1, source.getSourceId(), game, true, false); + return true; + } + Player targetPlayer = game.getPlayer(target.getFirstTarget()); + if (targetPlayer != null) { + targetPlayer.damage(1, source.getSourceId(), game, true, false); + return true; + } + } return false; }