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

AbilityFactory.calculateAmount is now useful when using TargetedPlayer$ with a Defined.

Browse Source
This commit is contained in:
jendave
2011-08-06 22:53:13 +00:00
parent 78b66eed19
commit 9d4d0dc3c7
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/forge/card/abilityFactory/AbilityFactory.java
View File

@@ -774,7 +774,12 @@ public class AbilityFactory {
if( calcX[0].startsWith("TargetedPlayer")) {
ArrayList<Player> players = new ArrayList<Player>();
SpellAbility saTargeting = (ability.getTarget() == null) ? findParentsTargetedPlayer(ability) : ability;
players.addAll(saTargeting.getTarget().getTargetPlayers());
if(saTargeting.getTarget() != null) {
players.addAll(saTargeting.getTarget().getTargetPlayers());
}
else {
players.addAll(getDefinedPlayers(card, saTargeting.getAbilityFactory().getMapParams().get("Defined"), saTargeting));
}
return CardFactoryUtil.playerXCount(players, calcX[1], card) * multiplier;
}