From 49ce794c455bc49123b99e2b2f115e1c09dbb39c Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Fri, 9 Jun 2023 07:00:03 +0400
Subject: [PATCH] Merge fix
---
Mage/src/main/java/mage/game/combat/CombatGroup.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Mage/src/main/java/mage/game/combat/CombatGroup.java b/Mage/src/main/java/mage/game/combat/CombatGroup.java
index 445e418eae..3d19c9f121 100644
--- a/Mage/src/main/java/mage/game/combat/CombatGroup.java
+++ b/Mage/src/main/java/mage/game/combat/CombatGroup.java
@@ -686,7 +686,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
attackerList.remove(attackerId);
}
}
- if (newAttackerOrder.size() == attackerOrder.size()) {
+ if (attackerOrder.isEmpty() || newAttackerOrder.size() == attackerOrder.size()) {
attackerOrder.clear();
attackerOrder.addAll(newAttackerOrder);