From be4f3f63d309eecd2f6430dad03f4aca3d78e403 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 27 Mar 2014 20:06:19 +0100 Subject: [PATCH] * Hallowed Burial - Fixed possible NPE. --- Mage.Sets/src/mage/sets/eventide/HallowedBurial.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/sets/eventide/HallowedBurial.java b/Mage.Sets/src/mage/sets/eventide/HallowedBurial.java index f9c9eb7b59e..f72b1d51aa7 100644 --- a/Mage.Sets/src/mage/sets/eventide/HallowedBurial.java +++ b/Mage.Sets/src/mage/sets/eventide/HallowedBurial.java @@ -38,6 +38,7 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import mage.players.Player; /** * @@ -84,8 +85,12 @@ class HallowedBurialEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - for (Permanent creature : game.getBattlefield().getActivePermanents(new FilterCreaturePermanent(), source.getSourceId(), game)) { - creature.moveToZone(Zone.LIBRARY, source.getSourceId(), game, false); + Player controller = game.getPlayer(source.getControllerId()); + if (controller != null) { + for (Permanent creature : game.getBattlefield().getActivePermanents(new FilterCreaturePermanent(), source.getSourceId(), game)) { + creature.moveToZone(Zone.LIBRARY, source.getSourceId(), game, false); + } + return true; } return false; }