From b4a1e79f85bc0519da00ec6cc3423d911cbb1d3d Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 10 Sep 2013 16:06:46 +0200 Subject: [PATCH] * Psychic Strike - Fixed that second effect will be applied also if targeted spell can't be countered. --- .../mage/sets/gatecrash/PsychicStrike.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java b/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java index 4c20660b53d..44bd95394a8 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java @@ -88,21 +88,23 @@ class PsychicStrikeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { + boolean countered = false; StackObject stackObject = game.getStack().getStackObject(targetPointer.getFirst(game, source)); - if (stackObject != null && game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game)) { + if (game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game)) { + countered = true; + } + if (stackObject != null) { Player controller = game.getPlayer(stackObject.getControllerId()); - if (controller == null) { - return false; - } - int cardsCount = Math.min(2, controller.getLibrary().size()); - for (int i = 0; i < cardsCount; i++) { - Card card = controller.getLibrary().removeFromTop(game); - if (card != null) { - card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false); + if (controller != null) { + int cardsCount = Math.min(2, controller.getLibrary().size()); + for (int i = 0; i < cardsCount; i++) { + Card card = controller.getLibrary().removeFromTop(game); + if (card != null) { + card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false); + } } } - return true; } - return false; + return countered; } }