Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

add isOwned and isControlled methods. remove some null-checks, remove some unnecessary casts

Browse source
This commit is contained in:
igoudt 2018-07-04 14:24:11 +02:00
parent e46ad02918
commit 9f06046f22
464 changed files with 567 additions and 562 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,7 @@ public class TargetTriggeredAbility extends TargetObject {
return stackObject.getStackAbility() != null
&& (stackObject.getStackAbility() instanceof TriggeredAbility)
&& source != null
&& stackObject.getStackAbility().getControllerId().equals(source.getControllerId());
&& stackObject.getStackAbility().isControlledBy(source.getControllerId());
}
@Override
@ -53,7 +53,7 @@ public class TargetTriggeredAbility extends TargetObject {
for (StackObject stackObject : game.getStack()) {
if (stackObject.getStackAbility() != null
&& stackObject.getStackAbility() instanceof TriggeredAbility
&& stackObject.getStackAbility().getControllerId().equals(sourceControllerId)) {
&& stackObject.getStackAbility().isControlledBy(sourceControllerId)) {
return true;
}
}
@ -71,7 +71,7 @@ public class TargetTriggeredAbility extends TargetObject {
for (StackObject stackObject : game.getStack()) {
if (stackObject.getStackAbility() != null
&& stackObject.getStackAbility() instanceof TriggeredAbility
&& stackObject.getStackAbility().getControllerId().equals(sourceControllerId)) {
&& stackObject.getStackAbility().isControlledBy(sourceControllerId)) {
possibleTargets.add(stackObject.getStackAbility().getId());
}
}