From eeee6df02631bf37750d7f11bb23b72b07c81752 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 18 Apr 2014 16:04:08 +0200 Subject: [PATCH] Some minor fixes and changes to framework and some cards. --- Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java | 2 +- .../mage/abilities/keyword/UnblockableAbility.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java b/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java index 44bd95394a8..05a213f0f83 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PsychicStrike.java @@ -100,7 +100,7 @@ class PsychicStrikeEffect extends OneShotEffect { for (int i = 0; i < cardsCount; i++) { Card card = controller.getLibrary().removeFromTop(game); if (card != null) { - card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false); + controller.moveCardToGraveyardWithInfo(card, source.getSourceId(), game, Zone.LIBRARY); } } } diff --git a/Mage/src/mage/abilities/keyword/UnblockableAbility.java b/Mage/src/mage/abilities/keyword/UnblockableAbility.java index 1534b191d6b..89b7773e132 100644 --- a/Mage/src/mage/abilities/keyword/UnblockableAbility.java +++ b/Mage/src/mage/abilities/keyword/UnblockableAbility.java @@ -28,6 +28,7 @@ package mage.abilities.keyword; import mage.abilities.EvasionAbility; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.combat.UnblockableSourceEffect; /** @@ -36,7 +37,15 @@ import mage.abilities.effects.common.combat.UnblockableSourceEffect; public class UnblockableAbility extends EvasionAbility { public UnblockableAbility() { - this.addEffect(new UnblockableSourceEffect()); + this(""); + } + + public UnblockableAbility(String ruleText) { + Effect effect = new UnblockableSourceEffect(); + if (ruleText != null && !ruleText.isEmpty()) { + effect.setText(ruleText); + } + this.addEffect(effect); } private UnblockableAbility(UnblockableAbility ability) {