From 41006a822a6e37abc9a63b1923b1714e4299c495 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Sun, 20 May 2012 17:41:09 +0400
Subject: [PATCH] Aura replacement effect fix

---
 .../mage/abilities/effects/AuraReplacementEffect.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Mage/src/mage/abilities/effects/AuraReplacementEffect.java b/Mage/src/mage/abilities/effects/AuraReplacementEffect.java
index c87ada475c..e138d7c199 100644
--- a/Mage/src/mage/abilities/effects/AuraReplacementEffect.java
+++ b/Mage/src/mage/abilities/effects/AuraReplacementEffect.java
@@ -27,7 +27,6 @@
  */
 package mage.abilities.effects;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Duration;
 import mage.Constants.Outcome;
@@ -44,6 +43,8 @@ import mage.game.stack.StackAbility;
 import mage.players.Player;
 import mage.target.Target;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
@@ -75,6 +76,12 @@ public class AuraReplacementEffect extends ReplacementEffectImpl<AuraReplacement
         UUID sourceId = event.getSourceId();
         UUID controllerId = event.getPlayerId();
 
+        // Aura enters the battlefield attached
+        Object object = game.getState().getValue("attachTo:"+card.getId());
+        if (object != null && object instanceof PermanentCard) {
+            return false;
+        }
+
         UUID targetId = null;
         MageObject sourceObject = game.getObject(sourceId);
         if (sourceObject instanceof StackAbility) {
@@ -113,6 +120,7 @@ public class AuraReplacementEffect extends ReplacementEffectImpl<AuraReplacement
             game.setZone(card.getId(), Zone.BATTLEFIELD);
             game.applyEffects();
             permanent.entersBattlefield(event.getSourceId(), game);
+            game.applyEffects();
             game.fireEvent(new ZoneChangeEvent(permanent, controllerId, fromZone, Zone.BATTLEFIELD));
 
             if (targetPermanent != null) {