From 4cf79222f0ee32772ca8eee4c69bc133e1808d85 Mon Sep 17 00:00:00 2001 From: Hanmac Date: Sun, 6 May 2018 08:49:29 +0200 Subject: [PATCH] fix AiAttack with CHOSEN_FOG_EFFECT --- .../src/main/java/forge/ai/AiAttackController.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/AiAttackController.java b/forge-ai/src/main/java/forge/ai/AiAttackController.java index dffb3344d36..d6204530436 100644 --- a/forge-ai/src/main/java/forge/ai/AiAttackController.java +++ b/forge-ai/src/main/java/forge/ai/AiAttackController.java @@ -267,9 +267,15 @@ public class AiAttackController { // no need to block (already holding mana to cast fog next turn) if (!AiCardMemory.isMemorySetEmpty(ai, AiCardMemory.MemorySet.CHOSEN_FOG_EFFECT)) { // Don't send the card that'll do the fog effect to attack, it's unsafe! - if (attackers.contains(AiCardMemory.MemorySet.CHOSEN_FOG_EFFECT)) { - attackers.remove(AiCardMemory.MemorySet.CHOSEN_FOG_EFFECT); + + List toRemove = Lists.newArrayList(); + for(Card c : attackers) { + if (AiCardMemory.isRememberedCard(ai, c, AiCardMemory.MemorySet.CHOSEN_FOG_EFFECT)) { + toRemove.add(c); + } } + attackers.removeAll(toRemove); + return attackers; }