From d7671bf0b1033deedb803e1c448efe7db526509b Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 18 Apr 2017 23:59:06 +0200 Subject: [PATCH] * Time to Reflect - Fixed possible null pointer exception. --- Mage.Sets/src/mage/cards/t/TimeToReflect.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/cards/t/TimeToReflect.java b/Mage.Sets/src/mage/cards/t/TimeToReflect.java index 6c5cb7513d4..4c23e0f9fc0 100644 --- a/Mage.Sets/src/mage/cards/t/TimeToReflect.java +++ b/Mage.Sets/src/mage/cards/t/TimeToReflect.java @@ -45,6 +45,7 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; import mage.game.events.GameEvent; +import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.watchers.Watcher; @@ -73,7 +74,10 @@ public class TimeToReflect extends CardImpl { BlockedOrWasBlockedByAZombieWatcher watcher = (BlockedOrWasBlockedByAZombieWatcher) game.getState().getWatchers().get("BlockedOrWasBlockedByAZombieWatcher"); if (watcher != null) { for (MageObjectReference mor : watcher.getBlockedThisTurnCreatures()) { - creaturesThatBlockedOrWereBlockedByAZombie.add(new PermanentIdPredicate(mor.getPermanent(game).getId())); + Permanent permanent = mor.getPermanent(game); + if (permanent != null) { + creaturesThatBlockedOrWereBlockedByAZombie.add(new PermanentIdPredicate(permanent.getId())); + } } } filter.add(Predicates.or(creaturesThatBlockedOrWereBlockedByAZombie));