external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed AF Fight not checking for fighters on battlefield.

Browse Source
This commit is contained in:
Sloth
2012-05-07 16:56:33 +00:00
parent 3b20487e9b
commit 0bee7d8526
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/AllZoneUtil.java
View File

@@ -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);
}
/**

3
src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java
View File

@@ -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;
}