diff --git a/Mage.Sets/src/mage/cards/d/DarkDeal.java b/Mage.Sets/src/mage/cards/d/DarkDeal.java index 89f819a96ae..5abe0182f7e 100644 --- a/Mage.Sets/src/mage/cards/d/DarkDeal.java +++ b/Mage.Sets/src/mage/cards/d/DarkDeal.java @@ -62,8 +62,8 @@ class DarkDealEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if (player != null) { int cardsInHand = player.getHand().size(); - player.discard(cardsInHand, false, false, source, game); if (cardsInHand > 1) { + player.discard(cardsInHand, false, false, source, game); cardsToDraw.put(playerId, cardsInHand - 1); } } diff --git a/Mage.Sets/src/mage/cards/f/ForgottenCreation.java b/Mage.Sets/src/mage/cards/f/ForgottenCreation.java index 3b05c1b8bf2..f9ac38f8d75 100644 --- a/Mage.Sets/src/mage/cards/f/ForgottenCreation.java +++ b/Mage.Sets/src/mage/cards/f/ForgottenCreation.java @@ -66,8 +66,10 @@ class ForgottenCreationEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { int cardsInHand = controller.getHand().size(); - controller.discard(cardsInHand, false, false, source, game); - controller.drawCards(cardsInHand, source, game); + if (cardsInHand > 0) { + controller.discard(cardsInHand, false, false, source, game); + controller.drawCards(cardsInHand, source, game); + } return true; } return false; diff --git a/Mage.Sets/src/mage/cards/i/IncendiaryCommand.java b/Mage.Sets/src/mage/cards/i/IncendiaryCommand.java index da9233c3e28..339ceb9c41e 100644 --- a/Mage.Sets/src/mage/cards/i/IncendiaryCommand.java +++ b/Mage.Sets/src/mage/cards/i/IncendiaryCommand.java @@ -83,8 +83,8 @@ class IncendiaryCommandDrawEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if (player != null) { int cardsInHand = player.getHand().size(); - player.discard(cardsInHand, false, false, source, game); if (cardsInHand > 0) { + player.discard(cardsInHand, false, false, source, game); cardsToDraw.put(playerId, cardsInHand); } } diff --git a/Mage.Sets/src/mage/cards/k/KhorvathsFury.java b/Mage.Sets/src/mage/cards/k/KhorvathsFury.java index e1ef02c7fdb..36488305972 100644 --- a/Mage.Sets/src/mage/cards/k/KhorvathsFury.java +++ b/Mage.Sets/src/mage/cards/k/KhorvathsFury.java @@ -67,15 +67,16 @@ class KhorvathsFuryEffect extends OneShotEffect { for (Player player : choice.getFriends()) { if (player != null) { int cardsInHand = player.getHand().size(); - player.discard(cardsInHand, false, false, source, game); if (cardsInHand > 0) { + player.discard(cardsInHand, false, false, source, game); cardsToDraw.put(player.getId(), cardsInHand); } } } for (Player player : choice.getFriends()) { if (player != null) { - player.drawCards(cardsToDraw.get(player.getId()) + 1, source, game); + // If a friend has zero cards in hand, that player discards nothing and draws one card. (2018-06-08) + player.drawCards(cardsToDraw.getOrDefault(player.getId(), 0) + 1, source, game); } } for (Player player : choice.getFoes()) {