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

Player: add wasDealtCombatDamageThisCombatBy

Browse Source
This commit is contained in:
Hanmac
2016-08-11 07:42:27 +00:00
parent c89505a372
commit 20af5a070a
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -2010,6 +2010,19 @@ public class Player extends GameEntity implements Comparable<Player> {
if (equals(source.getOwner())) {
return false;
}
} else if (property.startsWith("wasDealtCombatDamageThisCombatBy ")) {
final String v = property.split(" ")[1];
final List<Card> cards = AbilityUtils.getDefinedCards(source, v, spellAbility);
boolean found = false;
for (final Card card : cards) {
if (card.getDamageHistory().getThisCombatDamaged().contains(this)) {
found = true;
break;
}
}
if (!found) {
return false;
}
} else if (property.equals("wasDealtDamageBySourceThisGame")) {
if (!source.getDamageHistory().getThisGameDamaged().contains(this)) {
return false;