From 845969bc34d4c099b80cdf370ac34cf10df23c84 Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 8 Oct 2025 20:41:02 +0300 Subject: [PATCH] Update forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java Co-authored-by: Chris H --- forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java index c63b2b06d4e..7af0f41188c 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java @@ -2048,7 +2048,11 @@ public class ComputerUtilCombat { // Order the combatants in preferred order in case legacy ordering is disabled if (!self.getGame().getRules().hasOrderCombatants()) { - // TODO: sometimes, orderAttackers needs to be called instead - differentiate this here somehow + if (combatant.isAttacking()) { + opposedCombatants = AiBlockController.orderBlockers(combatant, new CardCollection(opposedCombatants)); + } else { + opposedCombatants = AiBlockController.orderAttackers(combatant, opposedCombatants); + } block = AiBlockController.orderBlockers(attacker, new CardCollection(block)); // assume sorted in case the legacy option is enabled }