From 7bdfeefb1d9fa24436de5f30a7eaf98c8a50733c Mon Sep 17 00:00:00 2001 From: Sol Date: Wed, 12 Mar 2014 02:24:10 +0000 Subject: [PATCH] - Experimental fix for a single creature being declared as an Attacker twice --- forge-game/src/main/java/forge/game/combat/Combat.java | 6 ++++++ 1 file changed, 6 insertions(+) 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);