diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java index 8efc6986776..9158dbea0aa 100644 --- a/forge-game/src/main/java/forge/game/card/CardProperty.java +++ b/forge-game/src/main/java/forge/game/card/CardProperty.java @@ -25,6 +25,7 @@ import forge.game.zone.ZoneType; import forge.item.PaperCard; import forge.util.Expressions; import forge.util.TextUtil; +import forge.util.collect.FCollection; import forge.util.collect.FCollectionView; import org.apache.commons.lang3.StringUtils; @@ -1467,6 +1468,14 @@ public class CardProperty { return false; } } + if (property.startsWith("attacking ")) { // generic "attacking [DefinedGameEntity]" + FCollection defined = AbilityUtils.getDefinedEntities(source, property.split(" ")[1], + spellAbility); + final GameEntity defender = combat.getDefenderByAttacker(card); + if (!defined.contains(defender)) { + return false; + } + } } else if (property.startsWith("notattacking")) { return null == combat || !combat.isAttacking(card); } else if (property.equals("attackedThisCombat")) {