From ed32ee554d7a01c3334272fa0671c85bf36050ae Mon Sep 17 00:00:00 2001 From: Alexander Novotny Date: Mon, 24 Apr 2023 19:18:28 -0700 Subject: [PATCH] Removed erroneous check in dark deal effect (#10265) * Removed erroneous check in dark deal effect * Fixed NPE with empty hand in dark deal --- Mage.Sets/src/mage/cards/d/DarkDeal.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/d/DarkDeal.java b/Mage.Sets/src/mage/cards/d/DarkDeal.java index 5abe0182f7e..2bca816f0f3 100644 --- a/Mage.Sets/src/mage/cards/d/DarkDeal.java +++ b/Mage.Sets/src/mage/cards/d/DarkDeal.java @@ -62,7 +62,7 @@ class DarkDealEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if (player != null) { int cardsInHand = player.getHand().size(); - if (cardsInHand > 1) { + if(cardsInHand > 0) { player.discard(cardsInHand, false, false, source, game); cardsToDraw.put(playerId, cardsInHand - 1); } @@ -70,7 +70,7 @@ class DarkDealEffect extends OneShotEffect { } for (Map.Entry toDrawByPlayer : cardsToDraw.entrySet()) { Player player = game.getPlayer(toDrawByPlayer.getKey()); - if (player != null) { + if (player != null && toDrawByPlayer.getValue() > 0) { player.drawCards(toDrawByPlayer.getValue(), source, game); } }