github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed NPE

Browse source
This commit is contained in:
Oleg Agafonov 2021-03-07 23:45:50 +04:00
parent 53a2021a12
commit 0ab8d0d16f
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Mage/src/main/java/mage/target/common/TargetTriggeredAbility.java
View file

@ -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<UUID> possibleTargets(UUID sourceControllerId, Game game) {
Set<UUID> 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());
}