From c1fdd37ee4b153017f3bdca7c493ed928534a70a Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Fri, 18 Apr 2014 18:21:17 +0200
Subject: [PATCH] Some minor fixes and changes to framework and some cards.

---
 .../sets/journeyintonyx/RiseOfEagles.java     |  2 +-
 .../sets/mirrodinbesieged/BurntheImpure.java  | 32 +++++++------------
 .../common/combat/CantBlockTargetEffect.java  |  4 ++-
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/RiseOfEagles.java b/Mage.Sets/src/mage/sets/journeyintonyx/RiseOfEagles.java
index 2e88026bd42..a7fb6603671 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/RiseOfEagles.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/RiseOfEagles.java
@@ -68,7 +68,7 @@ public class RiseOfEagles extends CardImpl<RiseOfEagles> {
 class RiseOfEaglesBirdToken extends Token {
 
     public RiseOfEaglesBirdToken() {
-        super("Bird", "2/2 blue Bird enchantment creature tokens with flyingn");
+        super("Bird", "2/2 blue Bird enchantment creature tokens with flying");
         this.setOriginalExpansionSetCode("JOU");
         cardType.add(CardType.CREATURE);
         color.setColor(ObjectColor.BLUE);
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java
index 5039ca1c268..787cddf6b13 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java
@@ -25,18 +25,16 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.sets.mirrodinbesieged;
 
 import java.util.UUID;
-
-import mage.constants.CardType;
-import mage.constants.Rarity;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.keyword.InfectAbility;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
 import mage.constants.Outcome;
+import mage.constants.Rarity;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -48,15 +46,15 @@ import mage.target.common.TargetCreaturePermanent;
  */
 public class BurntheImpure extends CardImpl<BurntheImpure> {
 
-    public BurntheImpure (UUID ownerId) {
+    public BurntheImpure(UUID ownerId) {
         super(ownerId, 59, "Burn the Impure", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}");
         this.expansionSetCode = "MBS";
         this.color.setRed(true);
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
-        this.getSpellAbility().addEffect(new BurntheImpureEffect(3));
+        this.getSpellAbility().addEffect(new BurntheImpureEffect());
     }
 
-    public BurntheImpure (final BurntheImpure card) {
+    public BurntheImpure(final BurntheImpure card) {
         super(card);
     }
 
@@ -65,23 +63,17 @@ public class BurntheImpure extends CardImpl<BurntheImpure> {
         return new BurntheImpure(this);
     }
 
-    public class BurntheImpureEffect extends OneShotEffect<BurntheImpureEffect> {
+}
 
-    protected int amount;
+class BurntheImpureEffect extends OneShotEffect<BurntheImpureEffect> {
 
-    public BurntheImpureEffect(int amount) {
+    public BurntheImpureEffect() {
         super(Outcome.Damage);
-        this.amount = amount;
         staticText = "{this} deals 3 damage to target creature. If that creature has infect, {this} deals 3 damage to that creature's controller.";
     }
 
-    public int getAmount() {
-        return amount;
-    }
-
     public BurntheImpureEffect(final BurntheImpureEffect effect) {
         super(effect);
-        this.amount = effect.amount;
     }
 
     @Override
@@ -91,13 +83,13 @@ public class BurntheImpure extends CardImpl<BurntheImpure> {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Permanent permanent = game.getPermanent(source.getFirstTarget());
+        Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
         if (permanent != null) {
-            permanent.damage(amount, source.getId(), game, true, false);
+            permanent.damage(3, source.getSourceId(), game, true, false);
             if (permanent.getAbilities().contains(InfectAbility.getInstance())) {
                 Player controller = game.getPlayer(permanent.getControllerId());
                 if (controller != null) {
-                    controller.damage(amount, source.getSourceId(), game, true, false);
+                    controller.damage(3, source.getSourceId(), game, false, true);
                 }
             }
             return true;
@@ -106,5 +98,3 @@ public class BurntheImpure extends CardImpl<BurntheImpure> {
     }
 
 }
-
-}
diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBlockTargetEffect.java b/Mage/src/mage/abilities/effects/common/combat/CantBlockTargetEffect.java
index 932077a007f..2196616dd28 100644
--- a/Mage/src/mage/abilities/effects/common/combat/CantBlockTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/combat/CantBlockTargetEffect.java
@@ -67,10 +67,12 @@ public class CantBlockTargetEffect extends RestrictionEffect<CantBlockTargetEffe
 
     @Override
     public String getText(Mode mode) {
+        if (staticText != null && !staticText.isEmpty()) {
+            return staticText;
+        }
         if (mode.getTargets().isEmpty()) {
             return "";
         }
-
         StringBuilder sb = new StringBuilder();
         Target target = mode.getTargets().get(0);
         if (target.getMaxNumberOfTargets() > 1) {