- Improved AI using Knight of the Reliquary.

forge-ai/src/main/java/forge/ai/ComputerUtil.java

@@ -859,7 +859,8 @@ public class ComputerUtil {
                 && sa.getPayCosts().hasTapCost()
                 && (ph.getPhase().isBefore(PhaseType.COMBAT_DECLARE_BLOCKERS)
                         || !ph.getNextTurn().equals(sa.getActivatingPlayer()))
-                && !sa.getHostCard().hasSVar("EndOfTurnLeavePlay"));
+                && !sa.getHostCard().hasSVar("EndOfTurnLeavePlay")
+                && !sa.hasParam("ActivationPhases"));
     }
 
     //returns true if it's better to wait until blockers are declared).

forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java

@@ -296,6 +296,10 @@ public class ChangeZoneAi extends SpellAbilityAi {
             }
         }
         
+        if (ComputerUtil.playImmediately(ai, sa)) {
+        	return true;
+        }
+
         // don't use fetching to top of library/graveyard before main2
         if (ai.getGame().getPhaseHandler().getPhase().isBefore(PhaseType.MAIN2)
                 && !sa.hasParam("ActivationPhases")) {
@@ -308,6 +312,10 @@ public class ChangeZoneAi extends SpellAbilityAi {
             }
         }
 
+        if (ComputerUtil.waitForBlocking(sa)) {
+        	return false;
+        }
+
         final AbilitySub subAb = sa.getSubAbility();
         return subAb == null || SpellApiToAi.Converter.get(subAb.getApi()).chkDrawbackWithSubs(ai, subAb);
     }

forge-ai/src/main/java/forge/ai/ability/DiscardAi.java

@@ -99,7 +99,7 @@ public class DiscardAi extends SpellAbilityAi {
         }
 
         // Don't tap creatures that may be able to block
-        if (ComputerUtil.waitForBlocking(sa) && !sa.hasParam("ActivationPhases")) {
+        if (ComputerUtil.waitForBlocking(sa)) {
             return false;
         }
 

forge-ai/src/main/java/forge/ai/ability/DrawAi.java

@@ -121,7 +121,7 @@ public class DrawAi extends SpellAbilityAi {
         }
 
         // Don't tap creatures that may be able to block
-        if (ComputerUtil.waitForBlocking(sa) && !sa.hasParam("ActivationPhases")) {
+        if (ComputerUtil.waitForBlocking(sa)) {
             return false;
         }