From 3fccf40155adb5364cbb54a09c8f30131cb0dfe9 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 17 Sep 2018 16:06:47 -0400 Subject: [PATCH] fixed null pointer exception --- Mage/src/main/java/mage/abilities/AbilityImpl.java | 4 +++- Mage/src/main/java/mage/game/stack/StackAbility.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/AbilityImpl.java b/Mage/src/main/java/mage/abilities/AbilityImpl.java index 4d189d54a8a..6047e079694 100644 --- a/Mage/src/main/java/mage/abilities/AbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/AbilityImpl.java @@ -1236,6 +1236,8 @@ public abstract class AbilityImpl implements Ability { @Override public void adjustTargets(Game game) { - this.targetAdjuster.adjustTargets(this, game); + if (targetAdjuster != null) { + targetAdjuster.adjustTargets(this, game); + } } } diff --git a/Mage/src/main/java/mage/game/stack/StackAbility.java b/Mage/src/main/java/mage/game/stack/StackAbility.java index b86a2259726..4c7259ed7d8 100644 --- a/Mage/src/main/java/mage/game/stack/StackAbility.java +++ b/Mage/src/main/java/mage/game/stack/StackAbility.java @@ -607,6 +607,8 @@ public class StackAbility extends StackObjImpl implements Ability { @Override public void adjustTargets(Game game) { - this.targetAdjuster.adjustTargets(this, game); + if (targetAdjuster != null) { + targetAdjuster.adjustTargets(this, game); + } } }