Fixed Issue 259.

This commit is contained in:
magenoxx 2011-10-12 20:29:00 +04:00
parent c2324bf5c5
commit 43b83cd8d5

View file

@ -92,8 +92,10 @@ class HalimarDepthsEffect extends OneShotEffect<HalimarDepthsEffect> {
int count = Math.min(player.getLibrary().size(), 3); int count = Math.min(player.getLibrary().size(), 3);
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
Card card = player.getLibrary().removeFromTop(game); Card card = player.getLibrary().removeFromTop(game);
cards.add(card); if (card != null) {
game.setZone(card.getId(), Zone.PICK); cards.add(card);
game.setZone(card.getId(), Zone.PICK);
}
} }
if (cards.size() > 1) { if (cards.size() > 1) {
TargetCard target2 = new TargetCard(Zone.PICK, filter2); TargetCard target2 = new TargetCard(Zone.PICK, filter2);
@ -101,14 +103,18 @@ class HalimarDepthsEffect extends OneShotEffect<HalimarDepthsEffect> {
while (cards.size() > 1) { while (cards.size() > 1) {
player.choose(Outcome.Detriment, cards, target2, game); player.choose(Outcome.Detriment, cards, target2, game);
Card card = cards.get(target2.getFirstTarget(), game); Card card = cards.get(target2.getFirstTarget(), game);
cards.remove(card); if (card != null) {
card.moveToZone(Zone.LIBRARY, source.getId(), game, true); cards.remove(card);
target2.clearChosen(); card.moveToZone(Zone.LIBRARY, source.getId(), game, true);
} }
target2.clearChosen();
}
} }
if (cards.size() == 1) { if (cards.size() == 1) {
Card card = cards.get(cards.iterator().next(), game); 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; return true;
} }