From 12cedf945d8135ded9c06a4559607f93675a4b8b Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Tue, 22 Aug 2017 21:34:14 -0400 Subject: [PATCH] Fixed bug #3835, stolen creatures that exploit themselves now trigger for the appropriate player --- .../abilities/common/ExploitCreatureTriggeredAbility.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/common/ExploitCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/ExploitCreatureTriggeredAbility.java index c5e4f734f45..ab918463199 100644 --- a/Mage/src/main/java/mage/abilities/common/ExploitCreatureTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/ExploitCreatureTriggeredAbility.java @@ -63,7 +63,6 @@ public class ExploitCreatureTriggeredAbility extends TriggeredAbilityImpl { return new ExploitCreatureTriggeredAbility(this); } - @Override public boolean checkEventType(GameEvent event, Game game) { return event.getType() == GameEvent.EventType.EXPLOITED_CREATURE; @@ -74,7 +73,8 @@ public class ExploitCreatureTriggeredAbility extends TriggeredAbilityImpl { if (event.getTargetId().equals(getSourceId()) && event.getSourceId().equals(getSourceId())) { if (!this.hasSourceObjectAbility(game, source, event)) { return false; - } + } + this.setControllerId(event.getPlayerId()); return true; // if Exploits creature sacrifices itself, exploit triggers } return super.isInUseableZone(game, source, event); @@ -83,7 +83,7 @@ public class ExploitCreatureTriggeredAbility extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { if (event.getSourceId().equals(getSourceId())) { - for (Effect effect: getEffects()) { + for (Effect effect : getEffects()) { if (setTargetPointer == SetTargetPointer.PERMANENT) { effect.setTargetPointer(new FixedTarget(event.getTargetId())); } @@ -98,4 +98,3 @@ public class ExploitCreatureTriggeredAbility extends TriggeredAbilityImpl { return "When {this} exploits a creature, " + super.getRule(); } } -