Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

null safety check

Browse source
This commit is contained in:
xenohedron 2024-02-21 01:04:57 -05:00
parent 35158d7770
commit 4d75402e6d
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Mage/src/main/java/mage/abilities/effects/common/RevealAndSeparatePilesEffect.java
View file

@ -107,7 +107,10 @@ public class RevealAndSeparatePilesEffect extends OneShotEffect {
Cards cards = new CardsImpl(controller.getLibrary().getTopCards(game, toReveal));
controller.revealCards(source, cards, game);
Player separatingPlayer = this.getExecutingPlayer(controller, game, source, playerWhoSeparates, "separate the revealed cards");
Player separatingPlayer = getExecutingPlayer(controller, game, source, playerWhoSeparates, "separate the revealed cards");
if (separatingPlayer == null) {
return false;
}
TargetCard target = new TargetCard(0, cards.size(), Zone.LIBRARY, filter);
List<Card> pile1 = new ArrayList<>();
separatingPlayer.choose(Outcome.Neutral, cards, target, source, game);
@ -117,10 +120,12 @@ public class RevealAndSeparatePilesEffect extends OneShotEffect {
.filter(Objects::nonNull)
.forEach(pile1::add);
cards.removeIf(target.getTargets()::contains);
List<Card> pile2 = new ArrayList<>();
pile2.addAll(cards.getCards(game));
List<Card> pile2 = new ArrayList<>(cards.getCards(game));
Player choosingPlayer = this.getExecutingPlayer(controller, game, source, playerWhoChooses, "choose the piles");
Player choosingPlayer = getExecutingPlayer(controller, game, source, playerWhoChooses, "choose the piles");
if (choosingPlayer == null) {
return false;
}
boolean choice = choosingPlayer.choosePile(outcome, "Choose a pile to put into hand.", pile1, pile2, game);
Zone pile1Zone = choice ? Zone.HAND : targetZone;