From f3d4194adda940a5fc9bfef9ed68a1ff30c7c487 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 24 Jun 2018 02:01:20 +0200 Subject: [PATCH] * Palladia-Mors, the Ruiner - Fixed possible exception. --- Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java b/Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java index 57e06bac912..66db41dd0d7 100644 --- a/Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java +++ b/Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java @@ -79,7 +79,7 @@ enum PalladiaMorsTheRuinerCondition implements Condition { public boolean apply(Game game, Ability source) { Permanent permanent = game.getBattlefield().getPermanent(source.getSourceId()); PalladiaMorsTheRuinerWatcher watcher = (PalladiaMorsTheRuinerWatcher) game.getState().getWatchers().get(PalladiaMorsTheRuinerWatcher.class.getSimpleName()); - return !watcher.getDamagers().contains(new MageObjectReference(permanent, game)); + return permanent != null && !watcher.getDamagers().contains(new MageObjectReference(permanent, game)); } @Override @@ -91,7 +91,7 @@ enum PalladiaMorsTheRuinerCondition implements Condition { class PalladiaMorsTheRuinerWatcher extends Watcher { - private Set damagers = new HashSet(); + private final Set damagers = new HashSet(); public PalladiaMorsTheRuinerWatcher() { super(PalladiaMorsTheRuinerWatcher.class.getSimpleName(), WatcherScope.GAME);