From c241b45a91e8414d45881191cb80e79bdc7f80b4 Mon Sep 17 00:00:00 2001 From: jeff Date: Wed, 20 Jul 2016 16:08:42 -0500 Subject: [PATCH] - Added a null check for The Great Aurora --- Mage.Sets/src/mage/sets/magicorigins/TheGreatAurora.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/sets/magicorigins/TheGreatAurora.java b/Mage.Sets/src/mage/sets/magicorigins/TheGreatAurora.java index 6d7c462e591..6bf2dabfa9f 100644 --- a/Mage.Sets/src/mage/sets/magicorigins/TheGreatAurora.java +++ b/Mage.Sets/src/mage/sets/magicorigins/TheGreatAurora.java @@ -117,10 +117,12 @@ class TheGreatAuroraEffect extends OneShotEffect { player.moveCards(player.getHand(), Zone.LIBRARY, source, game); List list = permanentsOwned.remove(player.getId()); permanentsCount.put(playerId, handCards + (list != null ? list.size() : 0)); - for (Permanent permanent : list) { - player.moveCardToLibraryWithInfo(permanent, source.getSourceId(), game, Zone.BATTLEFIELD, true, true); + if (list != null) { + for (Permanent permanent : list) { + player.moveCardToLibraryWithInfo(permanent, source.getSourceId(), game, Zone.BATTLEFIELD, true, true); + } + player.shuffleLibrary(source, game); } - player.shuffleLibrary(source, game); } }