From 43b83cd8d598025ca69a323f0df9c43d65c65be3 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Wed, 12 Oct 2011 20:29:00 +0400 Subject: [PATCH] Fixed Issue 259. --- .../mage/sets/worldwake/HalimarDepths.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/sets/worldwake/HalimarDepths.java b/Mage.Sets/src/mage/sets/worldwake/HalimarDepths.java index c04f9be4758..da98ecc6f25 100644 --- a/Mage.Sets/src/mage/sets/worldwake/HalimarDepths.java +++ b/Mage.Sets/src/mage/sets/worldwake/HalimarDepths.java @@ -92,8 +92,10 @@ class HalimarDepthsEffect extends OneShotEffect { int count = Math.min(player.getLibrary().size(), 3); for (int i = 0; i < count; i++) { Card card = player.getLibrary().removeFromTop(game); - cards.add(card); - game.setZone(card.getId(), Zone.PICK); + if (card != null) { + cards.add(card); + game.setZone(card.getId(), Zone.PICK); + } } if (cards.size() > 1) { TargetCard target2 = new TargetCard(Zone.PICK, filter2); @@ -101,14 +103,18 @@ class HalimarDepthsEffect extends OneShotEffect { while (cards.size() > 1) { player.choose(Outcome.Detriment, cards, target2, game); Card card = cards.get(target2.getFirstTarget(), game); - cards.remove(card); - card.moveToZone(Zone.LIBRARY, source.getId(), game, true); - target2.clearChosen(); - } + if (card != null) { + cards.remove(card); + card.moveToZone(Zone.LIBRARY, source.getId(), game, true); + } + target2.clearChosen(); + } } if (cards.size() == 1) { Card card = cards.get(cards.iterator().next(), game); - card.moveToZone(Zone.LIBRARY, source.getId(), game, true); + if (card != null) { + card.moveToZone(Zone.LIBRARY, source.getId(), game, true); + } } return true; }