From 0ab8d0d16f58ca8c0a24f3c03ce9655b916b4ba3 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sun, 7 Mar 2021 23:45:50 +0400 Subject: [PATCH] Fixed NPE --- .../mage/target/common/TargetTriggeredAbility.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Mage/src/main/java/mage/target/common/TargetTriggeredAbility.java b/Mage/src/main/java/mage/target/common/TargetTriggeredAbility.java index 1c99bc642e8..54a7e3513d9 100644 --- a/Mage/src/main/java/mage/target/common/TargetTriggeredAbility.java +++ b/Mage/src/main/java/mage/target/common/TargetTriggeredAbility.java @@ -37,8 +37,8 @@ public class TargetTriggeredAbility extends TargetObject { } StackObject stackObject = game.getStack().getStackObject(id); - return stackObject.getStackAbility() != null - && (stackObject.getStackAbility() instanceof TriggeredAbility) + return stackObject != null + && stackObject.getStackAbility() instanceof TriggeredAbility && source != null && stackObject.getStackAbility().isControlledBy(source.getControllerId()); } @@ -51,8 +51,7 @@ public class TargetTriggeredAbility extends TargetObject { @Override public boolean canChoose(UUID sourceControllerId, Game game) { for (StackObject stackObject : game.getStack()) { - if (stackObject.getStackAbility() != null - && stackObject.getStackAbility() instanceof TriggeredAbility + if (stackObject.getStackAbility() instanceof TriggeredAbility && stackObject.getStackAbility().isControlledBy(sourceControllerId)) { return true; } @@ -69,8 +68,7 @@ public class TargetTriggeredAbility extends TargetObject { public Set possibleTargets(UUID sourceControllerId, Game game) { Set possibleTargets = new HashSet<>(); for (StackObject stackObject : game.getStack()) { - if (stackObject.getStackAbility() != null - && stackObject.getStackAbility() instanceof TriggeredAbility + if (stackObject.getStackAbility() instanceof TriggeredAbility && stackObject.getStackAbility().isControlledBy(sourceControllerId)) { possibleTargets.add(stackObject.getStackAbility().getId()); }