From 1365e7ff6c8c50a4a3cc30bdf86ddd01f9e2a69d Mon Sep 17 00:00:00 2001 From: Tosh94 Date: Sun, 8 Dec 2019 17:03:47 +0100 Subject: [PATCH] Fix NPE when using Nicol Bolas, God-Pharaoh's +1 when an opponent has no cards in hand. --- .../src/mage/cards/n/NicolBolasGodPharaoh.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java b/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java index b992b93f070..186e337692a 100644 --- a/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java +++ b/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java @@ -98,11 +98,17 @@ class NicolBolasGodPharaohPlusOneEffect extends OneShotEffect { Player opponent = game.getPlayer(opponentId); if (opponent != null) { int numberOfCardsToExile = Math.min(2, opponent.getHand().size()); - Target target = new TargetCardInHand(numberOfCardsToExile, new FilterCard()); - target.setRequired(true); - if (opponent.chooseTarget(Outcome.Exile, target, source, game)) { - Cards cards = new CardsImpl(target.getTargets()); - cardsToExile.put(opponentId, cards); + if(numberOfCardsToExile > 0) { + Target target = new TargetCardInHand(numberOfCardsToExile, new FilterCard()); + target.setRequired(true); + if (opponent.chooseTarget(Outcome.Exile, target, source, game)) { + Cards cards = new CardsImpl(target.getTargets()); + cardsToExile.put(opponentId, cards); + } + } + else + { + cardsToExile.put(opponentId, new CardsImpl()); } } }