diff --git a/Mage.Sets/src/mage/cards/d/Duplicity.java b/Mage.Sets/src/mage/cards/d/Duplicity.java index 4abcd007274..5a5f34e067d 100644 --- a/Mage.Sets/src/mage/cards/d/Duplicity.java +++ b/Mage.Sets/src/mage/cards/d/Duplicity.java @@ -112,16 +112,17 @@ class DuplicityExileHandEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); MageObject sourceObject = game.getObject(source); - if (controller != null - && sourceObject != null) { - if (!controller.getHand().isEmpty()) { - UUID exileId = source.getSourceId(); + if (controller != null && sourceObject != null) { + UUID exileId = source.getSourceId(); + Set cardsInExile = game.getExile().getExileZone(exileId).getCards(game); + if (controller.getHand().isEmpty()) { + controller.moveCards(cardsInExile, Zone.HAND, source, game); + } else { Set cardsFromHandToExile = controller.getHand().getCards(game); for (Card card : cardsFromHandToExile) { controller.moveCardsToExile(card, source, game, true, exileId, sourceObject.getName()); card.setFaceDown(true, game); } - Set cardsInExile = game.getExile().getExileZone(exileId).getCards(game); Set cardsToReturnToHandFromExile = new HashSet<>(); for (Card card : cardsInExile) { if (!cardsFromHandToExile.contains(card)) {