diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index 45b9b871c34..65a60f4373f 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -4718,7 +4718,7 @@ public class Card extends GameEntity implements Comparable { return false; } } else if (property.startsWith("dealtCombatDamageThisTurn ") || property.startsWith("notDealtCombatDamageThisTurn ")) { - final String v = property.split(" ")[1]; + final String v = property.split(" ")[1]; final List list = getDamageHistory().getThisTurnCombatDamaged(); boolean found = false; for (final GameEntity e : list) { @@ -4730,6 +4730,19 @@ public class Card extends GameEntity implements Comparable { if (found == property.startsWith("not")) { return false; } + } else if (property.startsWith("dealtCombatDamageThisCombat ") || property.startsWith("notDealtCombatDamageThisCombat ")) { + final String v = property.split(" ")[1]; + final List list = getDamageHistory().getThisCombatDamaged(); + boolean found = false; + for (final GameEntity e : list) { + if (e.isValid(v, sourceController, source, spellAbility)) { + found = true; + break; + } + } + if (found == property.startsWith("not")) { + return false; + } } else if (property.startsWith("controllerWasDealtCombatDamageByThisTurn")) { if (!source.getDamageHistory().getThisTurnCombatDamaged().contains(controller)) { return false;