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

2
Mage/src/main/java/mage/abilities/common/AttackedByCreatureTriggeredAbility.java
View file

@ -60,7 +60,7 @@ public class AttackedByCreatureTriggeredAbility extends TriggeredAbilityImpl {
UUID defendingPlayer = game.getCombat().getDefendingPlayerId(event.getSourceId(), game);
Permanent attackingCreature = game.getPermanent(event.getSourceId());
if (filter.match(attackingCreature, game)
&& getControllerId().equals(defendingPlayer)
&& isControlledBy(defendingPlayer)
&& attackingCreature != null) {
switch (setTargetPointer) {
case PERMANENT: