From 8435bfaa6fae752e83b63221c40db3b3f5341d0e Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 18 Jun 2013 13:26:00 +0200 Subject: [PATCH] * Binding Angel - Fixed the bug, that the "skip next combat phase" ability did not work. --- Mage.Sets/src/mage/sets/nemesis/BlindingAngel.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Mage.Sets/src/mage/sets/nemesis/BlindingAngel.java b/Mage.Sets/src/mage/sets/nemesis/BlindingAngel.java index 039550ef59b..0d2309162e7 100644 --- a/Mage.Sets/src/mage/sets/nemesis/BlindingAngel.java +++ b/Mage.Sets/src/mage/sets/nemesis/BlindingAngel.java @@ -36,11 +36,13 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.constants.TurnPhase; import mage.game.Game; import mage.game.turn.TurnMod; +import mage.players.Player; /** * @@ -80,15 +82,15 @@ class SkipNextCombatEffect extends OneShotEffect { staticText = "that player skips his or her next combat phase"; } - public SkipNextCombatEffect(SkipNextCombatEffect effect) { + public SkipNextCombatEffect(final SkipNextCombatEffect effect) { super(effect); } @Override public boolean apply(Game game, Ability source) { - UUID targetId = source.getFirstTarget(); - if (targetId != null) { - game.getState().getTurnMods().add(new TurnMod(targetId, TurnPhase.COMBAT, null, true)); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); + if (player != null) { + game.getState().getTurnMods().add(new TurnMod(player.getId(), TurnPhase.COMBAT, null, true)); return true; } return false; @@ -96,6 +98,6 @@ class SkipNextCombatEffect extends OneShotEffect { @Override public SkipNextCombatEffect copy() { - return new SkipNextCombatEffect(); + return new SkipNextCombatEffect(this); } } \ No newline at end of file