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

- TargetsValid should find targets in the subabilities

Browse Source
This commit is contained in:
swordshine
2013-09-22 00:38:44 +00:00
parent bb4f967353
commit ffcfd24781
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java
View File

@@ -125,19 +125,22 @@ public class TriggerSpellAbilityCast extends Trigger {
} else { } else {
if (sa.getTargetRestrictions().doesTarget()) { if (sa.getTargetRestrictions().doesTarget()) {
boolean validTgtFound = false; boolean validTgtFound = false;
for (final Card tgt : sa.getTargets().getTargetCards()) { while (sa != null && !validTgtFound) {
if (tgt.isValid(this.mapParams.get("TargetsValid").split(","), this.getHostCard() for (final Card tgt : sa.getTargets().getTargetCards()) {
.getController(), this.getHostCard())) { if (tgt.isValid(this.mapParams.get("TargetsValid").split(","), this.getHostCard()
validTgtFound = true; .getController(), this.getHostCard())) {
break; validTgtFound = true;
break;
}
} }
}
for (final Player p : sa.getTargets().getTargetPlayers()) { for (final Player p : sa.getTargets().getTargetPlayers()) {
if (matchesValid(p, this.mapParams.get("TargetsValid").split(","), this.getHostCard())) { if (matchesValid(p, this.mapParams.get("TargetsValid").split(","), this.getHostCard())) {
validTgtFound = true; validTgtFound = true;
break; break;
}
} }
sa = sa.getSubAbility();
} }
if (!validTgtFound) { if (!validTgtFound) {