From ca72abc65c86a255bff52a0543e858a207dfaa8b Mon Sep 17 00:00:00 2001 From: Hanmac Date: Wed, 10 Aug 2016 15:02:31 +0000 Subject: [PATCH] Card: add notDealtCombatDamageThisTurn as negation --- forge-game/src/main/java/forge/game/card/Card.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 524e64870dc..edd1288eaab 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -4717,7 +4717,7 @@ public class Card extends GameEntity implements Comparable { if (!hasDealtDamageToOpponentThisTurn()) { return false; } - } else if (property.startsWith("dealtCombatDamageThisTurn ")) { + } else if (property.startsWith("dealtCombatDamageThisTurn ") || property.startsWith("notDealtCombatDamageThisTurn ")) { final String v = property.split(" ")[1]; final List list = getDamageHistory().getThisTurnCombatDamaged(); boolean found = false; @@ -4727,7 +4727,7 @@ public class Card extends GameEntity implements Comparable { break; } } - if (!found) { + if (found && property.startsWith("not")) { return false; } } else if (property.startsWith("controllerWasDealtCombatDamageByThisTurn")) {