From a5d6ba2530e6742144d4b24cb1ea2a1b81ca6956 Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 7 Nov 2018 09:11:22 +0300 Subject: [PATCH] - Logic fix in prioritizing creatures worth removing. --- .../src/main/java/forge/ai/ComputerUtilCard.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java index ec142dd9f35..42c1fec448b 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java @@ -1786,15 +1786,20 @@ public class ComputerUtilCard { CardCollection priorityCards = new CardCollection(); for (Card atk : oppCards) { + boolean canBeBlocked = false; if (isUselessCreature(atk.getController(), atk)) { continue; } for (Card blk : aiCreats) { - if (!CombatUtil.canBlock(atk, blk, true)) { - boolean threat = atk.getNetCombatDamage() >= ai.getLife() - lifeInDanger; - if (!priorityRemovalOnlyInDanger || threat) { - priorityCards.add(atk); - } + if (CombatUtil.canBlock(atk, blk, true)) { + canBeBlocked = true; + break; + } + } + if (!canBeBlocked) { + boolean threat = atk.getNetCombatDamage() >= ai.getLife() - lifeInDanger; + if (!priorityRemovalOnlyInDanger || threat) { + priorityCards.add(atk); } } }