github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-13 11:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Psychic Strike - Fixed that second effect will be applied also if targeted spell can't be countered.

Browse source
This commit is contained in:
LevelX2 2013-09-10 16:06:46 +02:00
parent 70e7fb0cdd
commit b4a1e79f85
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java
View file

@ -88,21 +88,23 @@ class PsychicStrikeEffect extends OneShotEffect<PsychicStrikeEffect> {
@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;
}
}