Commit df3996f2 authored by Michael Kamensky's avatar Michael Kamensky

Merge branch 'master' into 'master'

Fix ChooseCardEffect crashing for e.g. Curse of the Pierced Heart on a planeswalker

See merge request !1989
parents 6fa513fe 37fe37d5
......@@ -52,7 +52,7 @@ public class ChooseCardEffect extends SpellAbilityEffect {
}
CardCollectionView choices = game.getCardsIn(choiceZone);
if (sa.hasParam("Choices")) {
choices = CardLists.getValidCards(choices, sa.getParam("Choices"), activator, host);
choices = CardLists.getValidCards(choices, sa.getParam("Choices"), activator, host, sa);
}
if (sa.hasParam("TargetControls")) {
choices = CardLists.filterControlledBy(choices, tgtPlayers.get(0));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment