Refactor: improved choose cards method to use source param (fixed NPE like #10233, #9974 and other bugs with choose cards)

This commit is contained in:
Oleg Agafonov 2023-04-21 11:02:57 +04:00
parent 5474787641
commit 689b93d005
280 changed files with 341 additions and 342 deletions

View file

@ -173,7 +173,7 @@ class MadWizardsLairEffect extends OneShotEffect {
}
player.revealCards(source, cards, game);
TargetCardInHand target = new TargetCardInHand(0, 1, StaticFilters.FILTER_CARD_NON_LAND);
player.choose(Outcome.PlayForFree, cards, target, game);
player.choose(Outcome.PlayForFree, cards, target, source, game);
Card card = player.getHand().get(target.getFirstTarget(), game);
if (card == null) {
return true;

View file

@ -153,7 +153,7 @@ class ThroneOfTheDeadThreeEffect extends OneShotEffect {
break;
default:
TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE);
player.choose(outcome, cards, target, game);
player.choose(outcome, cards, target, source, game);
card = cards.get(target.getFirstTarget(), game);
}
if (card != null) {