From 178024e2484ff3aa736d3eceb510708da881a8d6 Mon Sep 17 00:00:00 2001 From: Sloth Date: Mon, 21 Oct 2013 19:53:04 +0000 Subject: [PATCH] - Fixed AI freeze caused by Fireball. --- src/main/java/forge/card/ability/ai/DamageAiBase.java | 4 ++++ src/main/java/forge/card/ability/ai/DamageDealAi.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/card/ability/ai/DamageAiBase.java b/src/main/java/forge/card/ability/ai/DamageAiBase.java index 130ead4bd9e..963da4b3f9a 100644 --- a/src/main/java/forge/card/ability/ai/DamageAiBase.java +++ b/src/main/java/forge/card/ability/ai/DamageAiBase.java @@ -22,6 +22,10 @@ public abstract class DamageAiBase extends SpellAbilityAi { if (!sa.canTarget(enemy)) { return false; } + if (sa.getTargets() != null && sa.getTargets().getTargets().contains(enemy)) { + return false; + } + // burn Planeswalkers if (Iterables.any(enemy.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.PLANEWALKERS)) { return true; diff --git a/src/main/java/forge/card/ability/ai/DamageDealAi.java b/src/main/java/forge/card/ability/ai/DamageDealAi.java index baa1b6314bd..25e8564fbb6 100644 --- a/src/main/java/forge/card/ability/ai/DamageDealAi.java +++ b/src/main/java/forge/card/ability/ai/DamageDealAi.java @@ -344,7 +344,7 @@ public class DamageDealAi extends DamageAiBase { } } // fell through all the choices, no targets left? - if (((sa.getTargets().getNumTargeted() < tgt.getMinTargets(source, sa)) || (sa.getTargets().getNumTargeted() == 0))) { + if (sa.getTargets().getNumTargeted() < tgt.getMinTargets(source, sa) || sa.getTargets().getNumTargeted() == 0) { if (!mandatory) { sa.resetTargets(); return false;