- Fixed ShuffleAi so that AI can cast spells like Ruin in Their Wake

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

@@ -29,28 +29,22 @@ public class ShuffleAi extends SpellAbilityAi {
 
     @Override
     public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return shuffleTargetAI(/*sa, false, false*/);
+        return shuffleTargetAI(sa);
     }
 
-
+    private boolean shuffleTargetAI(final SpellAbility sa) {
-    private boolean shuffleTargetAI(/*final SpellAbility sa, final boolean primarySA, final boolean mandatory*/) {
+        /*
-        return false;
+         *  Shuffle at the end of some other effect where we'd usually shuffle
-
+         *  inside that effect, but can't for some reason.
-
+         */
-
+        return sa.getParent() != null;
     } // shuffleTargetAI()
 
     @Override
     protected boolean doTriggerAINoCost(Player aiPlayer, SpellAbility sa, boolean mandatory) {
-        if (!shuffleTargetAI(/*sa, false, mandatory*/)) {
+        return shuffleTargetAI(sa);
-            return false;
-        }
-
-        return true;
     }  
 
-
-
     @Override
     public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
      // ai could analyze parameter denoting the player to shuffle