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

- Added Shieldmage Advocate

Browse Source
This commit is contained in:
swordshine
2014-02-28 04:30:40 +00:00
parent bef8f2cc69
commit fc6584086e
5 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -115,14 +115,15 @@ public class AbilityUtils {
// we don't want this to fall through and return the "Self"
return cards;
}
}
else if (defined.equals("Targeted")) {
} else if (defined.equals("Targeted")) {
final SpellAbility saTargeting = sa.getSATargetingCard();
if (saTargeting != null) {
Iterables.addAll(cards, saTargeting.getTargets().getTargetCards());
}
} else if (defined.equals("ThisTargetedCard")) { // do not add parent targeted
if (sa != null && sa.getTargets() != null) {
Iterables.addAll(cards, sa.getTargets().getTargetCards());
}
} else if (defined.equals("ParentTarget")) {
final SpellAbility parent = sa.getParentTargetingCard();
if (parent != null) {
@@ -746,7 +747,7 @@ public class AbilityUtils {
final String defined = (def == null) ? "You" : def;
final Game game = card == null ? null : card.getGame();
if (defined.equals("Targeted")) {
if (defined.equals("Targeted") || defined.equals("TargetedPlayer")) {
final SpellAbility saTargeting = sa.getSATargetingPlayer();
if (saTargeting != null) {
Iterables.addAll(players, saTargeting.getTargets().getTargetPlayers());