diff --git a/forge-game/src/main/java/forge/game/combat/Combat.java b/forge-game/src/main/java/forge/game/combat/Combat.java index 6d367d056bf..029a036c9ca 100644 --- a/forge-game/src/main/java/forge/game/combat/Combat.java +++ b/forge-game/src/main/java/forge/game/combat/Combat.java @@ -124,6 +124,12 @@ public class Combat { return; } + // This is trying to fix the issue of an attacker existing in two bands at once + AttackingBand existingBand = getBandOfAttacker(c); + if (existingBand != null) { + existingBand.removeAttacker(c); + } + if (band == null || !attackersOfDefender.contains(band)) { band = new AttackingBand(c, defender); attackersOfDefender.add(band);