From 6152933766d5fc00c1e3e9ee334f6f3a03d5f901 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Wed, 8 Oct 2025 10:38:19 +0300
Subject: [PATCH] - Only call the sort command in case legacy ordering is
 disabled, assume sorted elsewhere otherwise.

---
 forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
index bef268d2092..e041d0ef8d2 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
@@ -2046,9 +2046,12 @@ public class ComputerUtilCombat {
             // TODO sort remaining tramplers for DamageDone triggers
         }
 
-        // Order the combatants in preferred order
+        // Order the combatants in preferred order in case legacy ordering is disabled
+        final boolean legacyOrderCombatants = self.getGame().getRules().hasOrderCombatants();
         final CardCollection orderedBlockers = new CardCollection(block);
-        ComputerUtilCard.sortByEvaluateCreature(orderedBlockers);
+        if (!legacyOrderCombatants) {
+            ComputerUtilCard.sortByEvaluateCreature(orderedBlockers); // assume sorted in case the legacy option is enabled
+        }
 
         if (orderedBlockers.size() == 1) {
             final Card blocker = orderedBlockers.getFirst();