From c29f17e2b454b6bdf88b1be224332e8fd8a8ca32 Mon Sep 17 00:00:00 2001 From: excessum Date: Sat, 27 Feb 2016 04:07:20 +0000 Subject: [PATCH] - Fixed ShuffleAi so that AI can cast spells like Ruin in Their Wake --- .../main/java/forge/ai/ability/ShuffleAi.java | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/ShuffleAi.java b/forge-ai/src/main/java/forge/ai/ability/ShuffleAi.java index dc3ea1e8e79..1590c4c29f9 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ShuffleAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/ShuffleAi.java @@ -29,27 +29,21 @@ 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, final boolean primarySA, final boolean mandatory*/) { - return false; - - - + private boolean shuffleTargetAI(final SpellAbility sa) { + /* + * 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 false; - } - - return true; - } - - + return shuffleTargetAI(sa); + } @Override public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {