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

- Fixed a bug in ChooseCardEffect.

Browse Source
This commit is contained in:
Sloth
2013-11-15 09:37:08 +00:00
parent d4bc84c6bd
commit 8d79ed527f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui/src/main/java/forge/card/ability/effects/ChooseCardEffect.java
View File

@@ -34,7 +34,8 @@ public class ChooseCardEffect extends SpellAbilityEffect {
@Override
public void resolve(SpellAbility sa) {
final Card host = sa.getSourceCard();
final Game game = sa.getActivatingPlayer().getGame();
final Player activator = sa.getActivatingPlayer();
final Game game = activator.getGame();
final List<Card> chosen = new ArrayList<Card>();
final TargetRestrictions tgt = sa.getTargetRestrictions();
@@ -46,7 +47,7 @@ public class ChooseCardEffect extends SpellAbilityEffect {
}
List<Card> choices = game.getCardsIn(choiceZone);
if (sa.hasParam("Choices")) {
choices = CardLists.getValidCards(choices, sa.getParam("Choices"), host.getController(), host);
choices = CardLists.getValidCards(choices, sa.getParam("Choices"), activator, host);
}
if (sa.hasParam("TargetControls")) {
choices = CardLists.filterControlledBy(choices, tgtPlayers.get(0));