diff --git a/forge-ai/src/main/java/forge/ai/AiAttackController.java b/forge-ai/src/main/java/forge/ai/AiAttackController.java index 9738e90e712..a683e813479 100644 --- a/forge-ai/src/main/java/forge/ai/AiAttackController.java +++ b/forge-ai/src/main/java/forge/ai/AiAttackController.java @@ -1013,7 +1013,7 @@ public class AiAttackController { } } } - if (AiBlockController.canBeBlockedProfitably(defendingOpponent, attacker)) { + if (ComputerUtilCard.canBeBlockedProfitably(defendingOpponent, attacker)) { canKillAllDangerous = false; } diff --git a/forge-ai/src/main/java/forge/ai/AiBlockController.java b/forge-ai/src/main/java/forge/ai/AiBlockController.java index e45b2954f73..518e2127efc 100644 --- a/forge-ai/src/main/java/forge/ai/AiBlockController.java +++ b/forge-ai/src/main/java/forge/ai/AiBlockController.java @@ -927,17 +927,4 @@ public class AiBlockController { return first; } - /** - * Check if an attacker can be blocked profitably (ie. kill attacker) - * @param ai controller of attacking creature - * @param attacker attacking creature to evaluate - * @return attacker will die - */ - public static boolean canBeBlockedProfitably(final Player ai, Card attacker) { - AiBlockController aiBlk = new AiBlockController(ai); - Combat combat = new Combat(ai); - combat.addAttacker(attacker, ai); - aiBlk.assignBlockers(combat, null, attacker); - return ComputerUtilCombat.attackerWouldBeDestroyed(ai, attacker, combat); - } } diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java index b5678271901..5c78f8999d4 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java @@ -674,6 +674,20 @@ public class ComputerUtilCard { } } + /** + * Check if an attacker can be blocked profitably (ie. kill attacker) + * @param ai controller of attacking creature + * @param attacker attacking creature to evaluate + * @return attacker will die + */ + public static boolean canBeBlockedProfitably(final Player ai, Card attacker) { + AiBlockController aiBlk = new AiBlockController(ai); + Combat combat = new Combat(ai); + combat.addAttacker(attacker, ai); + aiBlk.assignBlockers(combat, null, attacker); + return ComputerUtilCombat.attackerWouldBeDestroyed(ai, attacker, combat); + } + /** * getMostExpensivePermanentAI. *