From 0bee7d85265d80fae7170d2ed052981c085d533c Mon Sep 17 00:00:00 2001 From: Sloth Date: Mon, 7 May 2012 16:56:33 +0000 Subject: [PATCH] - Fixed AF Fight not checking for fighters on battlefield. --- src/main/java/forge/AllZoneUtil.java | 2 +- .../forge/card/abilityfactory/AbilityFactoryDealDamage.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/AllZoneUtil.java b/src/main/java/forge/AllZoneUtil.java index e0b069570b2..e832282131e 100644 --- a/src/main/java/forge/AllZoneUtil.java +++ b/src/main/java/forge/AllZoneUtil.java @@ -163,7 +163,7 @@ public abstract class AllZoneUtil { * @return a boolean. */ public static boolean isCardInPlay(final Card card) { - return AllZoneUtil.getCardsIn(ZoneType.Battlefield).contains(card); + return card.getController().getCardsIn(ZoneType.Battlefield).contains(card); } /** diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java index dfcf6294c62..e63d10e252f 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java @@ -1754,7 +1754,8 @@ public class AbilityFactoryDealDamage { fighter2 = tgts.get(1); } - if (fighter1 == null || fighter2 == null) { + if (fighter1 == null || fighter2 == null || !AllZoneUtil.isCardInPlay(fighter1) + || !AllZoneUtil.isCardInPlay(fighter2)) { return; }