From 97af2dbe81d3f13735b7ac2b651a91a8d1aa4f16 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 3 Feb 2014 15:06:53 +0100 Subject: [PATCH] * Kiora, The Crashing Wave - Fixed possible java error (NPE). --- .../src/mage/sets/bornofthegods/KioraTheCrashingWave.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/sets/bornofthegods/KioraTheCrashingWave.java b/Mage.Sets/src/mage/sets/bornofthegods/KioraTheCrashingWave.java index 9b47e26081f..ba518087dce 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/KioraTheCrashingWave.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/KioraTheCrashingWave.java @@ -152,8 +152,9 @@ class KioraPreventionEffect extends PreventionEffectImpl @Override public boolean applies(GameEvent event, Ability source, Game game) { if (super.applies(event, source, game) && event instanceof DamageEvent) { - Permanent targetPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); - if (event.getSourceId().equals(targetPermanent.getId()) || event.getTargetId().equals(targetPermanent.getId())) { + Permanent targetPermanent = game.getPermanent(this.getTargetPointer().getFirst(game, source)); + if (targetPermanent != null + && (event.getSourceId().equals(targetPermanent.getId()) || event.getTargetId().equals(targetPermanent.getId()))) { return true; } }