From db1522d7bbcb2da6d235887d36c0c23eca701293 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Fri, 16 Dec 2011 17:57:35 +0000
Subject: [PATCH] - Tweaked the timing of the aura casting AI.

---
 .../card/abilityfactory/AbilityFactoryAttach.java  | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java
index 1d880d9dede..1e021a38d52 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java
@@ -865,17 +865,13 @@ public class AbilityFactoryAttach {
             source.setSVar("PayX", Integer.toString(xPay));
         }
 
-        if (AbilityFactory.isSorcerySpeed(sa)) {
-            if (AllZone.getPhase().is(Constant.Phase.MAIN1)) {
-                chance = r.nextFloat() <= .75;
-            } else {
-                // Don't Attach Sorcery Speed stuff after Main1
-                return false;
-            }
-        } else {
-            chance &= r.nextFloat() <= .75;
+        if (AllZone.getPhase().isAfter(Constant.Phase.COMBAT_DECLARE_BLOCKERS_INSTANT_ABILITY)
+                && !"Curse".equals(af.getMapParams().get("AILogic"))) {
+            return false;
         }
 
+        chance &= r.nextFloat() <= .75;
+
         return chance;
     }