From c0e4e7a4310622104db8ad30885ca590ddfc3383 Mon Sep 17 00:00:00 2001
From: North <robyter@gmail>
Date: Fri, 7 Sep 2012 00:36:32 +0300
Subject: [PATCH] Fixed Ghostform

---
 Mage.Sets/src/mage/sets/avacynrestored/Ghostform.java    | 9 +++------
 .../effects/common/UnblockableTargetEffect.java          | 7 ++++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Ghostform.java b/Mage.Sets/src/mage/sets/avacynrestored/Ghostform.java
index e3d536d6cda..fc1a99ae490 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/Ghostform.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/Ghostform.java
@@ -27,16 +27,13 @@
  */
 package mage.sets.avacynrestored;
 
-import mage.Constants;
+import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
-import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
-import mage.abilities.keyword.UnblockableAbility;
+import mage.abilities.effects.common.UnblockableTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreaturePermanent;
 
-import java.util.UUID;
-
 /**
  *
  * @author noxx
@@ -50,7 +47,7 @@ public class Ghostform extends CardImpl<Ghostform> {
         this.color.setBlue(true);
 
         // Up to two target creatures are unblockable this turn.
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(UnblockableAbility.getInstance(), Constants.Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new UnblockableTargetEffect());
         this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2));
     }
 
diff --git a/Mage/src/mage/abilities/effects/common/UnblockableTargetEffect.java b/Mage/src/mage/abilities/effects/common/UnblockableTargetEffect.java
index 237022bf919..782ea5a43e4 100644
--- a/Mage/src/mage/abilities/effects/common/UnblockableTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/UnblockableTargetEffect.java
@@ -61,7 +61,7 @@ public class UnblockableTargetEffect extends RestrictionEffect<UnblockableTarget
 
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
-        return permanent.getId().equals(source.getFirstTarget());
+        return this.targetPointer.getTargets(game, source).contains(permanent.getId());
     }
 
     @Override
@@ -80,10 +80,11 @@ public class UnblockableTargetEffect extends RestrictionEffect<UnblockableTarget
         }
         sb.append("target ").append(mode.getTargets().get(0).getTargetName());
         if (target.getMaxNumberOfTargets() > 1) {
-            sb.append("s");
+            sb.append("s are unblockable");
+        } else {
+            sb.append(" is unblockable");
         }
 
-        sb.append(" is unblockable");
         if (Duration.EndOfTurn.equals(this.duration)) {
             sb.append(" this turn");
         }