From 0b75e4866aad139ddfa2601e701840453dc6c0fb Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Mon, 26 Mar 2012 20:05:20 +0400
Subject: [PATCH] Fixed EntersBattlefieldEffect. PhantasmalImage's CopyEffect
 works now.

---
 .../org/mage/test/cards/copy/PhantasmalImageTest.java  |  2 +-
 .../abilities/effects/EntersBattlefieldEffect.java     | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java
index b18e87f9e77..6777a8c8846 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java
@@ -27,7 +27,7 @@ public class PhantasmalImageTest extends CardTestPlayerBase {
 
         assertLife(playerA, 20);
         assertLife(playerB, 20);
-        assertPermanentCount(playerA, "Phantasmal Image", 1);
+        assertPermanentCount(playerA, "Craw Wurm", 1);
         assertPermanentCount(playerB, "Craw Wurm", 1);
     }
 
diff --git a/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java b/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java
index 636a045c1b4..03da317aa5a 100644
--- a/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java
+++ b/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java
@@ -34,7 +34,6 @@ import mage.abilities.Mode;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
-import mage.game.stack.Spell;
 
 /**
  *
@@ -80,17 +79,20 @@ public class EntersBattlefieldEffect extends ReplacementEffectImpl<EntersBattlef
 
 	@Override
 	public boolean replaceEvent(GameEvent event, Ability source, Game game) {
-		Spell spell = game.getStack().getSpell(event.getSourceId());
+		//Spell spell = game.getStack().getSpell(event.getSourceId());
 		for (Effect effect: baseEffects) {
 			if (source.activate(game, false)) {
 				if (effect instanceof ContinuousEffect) {
 					game.addEffect((ContinuousEffect) effect, source);
 				}
 				else {
-					if (spell != null)
+                    // noxx: commented it out because of resulting in a bug
+                    // with CopyEffect (PhantasmalImageTest.java)
+					/*if (spell != null)
 						effect.apply(game, spell.getSpellAbility());
 					else
-						effect.apply(game, source);
+						effect.apply(game, source);*/
+                    effect.apply(game, source);
 				}
 			}
 		}