From cc6731285031b14dec6204db6c30f41ed4807a0b Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 9 Apr 2015 15:12:31 +0200 Subject: [PATCH] Fixed a bug recenttly introduced to handling of triggered abilities . --- Mage/src/mage/abilities/AbilityImpl.java | 4 +++- Mage/src/mage/abilities/common/AttacksTriggeredAbility.java | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/mage/abilities/AbilityImpl.java index 4327f93f2e5..0d6f71daf58 100644 --- a/Mage/src/mage/abilities/AbilityImpl.java +++ b/Mage/src/mage/abilities/AbilityImpl.java @@ -892,7 +892,9 @@ public abstract class AbilityImpl implements Ability { } if (object != null && !object.getAbilities().contains(this)) { - if (!(object instanceof Permanent)) { + if (object instanceof Permanent) { + return false; + } else { // check if it's an ability that is temporary gained to a card Abilities otherAbilities = game.getState().getAllOtherAbilities(this.getSourceId()); if (otherAbilities == null || !otherAbilities.contains(this)) { diff --git a/Mage/src/mage/abilities/common/AttacksTriggeredAbility.java b/Mage/src/mage/abilities/common/AttacksTriggeredAbility.java index 084633a74a4..c7e021de865 100644 --- a/Mage/src/mage/abilities/common/AttacksTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/AttacksTriggeredAbility.java @@ -35,7 +35,6 @@ import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.target.targetpointer.FixedTarget; /**