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

Card: add notDealtCombatDamageThisTurn as negation

Browse Source
This commit is contained in:
Hanmac
2016-08-10 15:02:31 +00:00
parent eb62bf1bef
commit ca72abc65c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -4717,7 +4717,7 @@ public class Card extends GameEntity implements Comparable<Card> {
if (!hasDealtDamageToOpponentThisTurn()) { if (!hasDealtDamageToOpponentThisTurn()) {
return false; return false;
} }
} else if (property.startsWith("dealtCombatDamageThisTurn ")) { } else if (property.startsWith("dealtCombatDamageThisTurn ") || property.startsWith("notDealtCombatDamageThisTurn ")) {
final String v = property.split(" ")[1]; final String v = property.split(" ")[1];
final List<GameEntity> list = getDamageHistory().getThisTurnCombatDamaged(); final List<GameEntity> list = getDamageHistory().getThisTurnCombatDamaged();
boolean found = false; boolean found = false;
@@ -4727,7 +4727,7 @@ public class Card extends GameEntity implements Comparable<Card> {
break; break;
} }
} }
if (!found) { if (found && property.startsWith("not")) {
return false; return false;
} }
} else if (property.startsWith("controllerWasDealtCombatDamageByThisTurn")) { } else if (property.startsWith("controllerWasDealtCombatDamageByThisTurn")) {