From b7f962669729bfe7c3d672ab139533e98bbc0c64 Mon Sep 17 00:00:00 2001 From: Dilnu Date: Fri, 23 Sep 2016 21:13:34 -0400 Subject: [PATCH 1/2] Small fixes to TriggeredAbilityImpl This fixes a type and removes a duplicate null check. --- Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java index 9cf9bf5719..37e1b5482a 100644 --- a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java @@ -88,7 +88,7 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge MageObject object = game.getObject(getSourceId()); Player player = game.getPlayer(this.getControllerId()); if (player != null && object != null) { - if (!player.chooseUse(getEffects().get(0).getOutcome(), (object != null ? this.getRule(object.getLogName()) : this.getRule()), this, game)) { + if (!player.chooseUse(getEffects().get(0).getOutcome(), this.getRule(object.getLogName()), this, game)) { return false; } } else { @@ -216,7 +216,7 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge /* 603.6c,603.6d - This has to be set, if the triggered ability has to check back in time if the permanent the ability is connected to had the ability on the battlefeild while the trigger is checked + This has to be set, if the triggered ability has to check back in time if the permanent the ability is connected to had the ability on the battlefield while the trigger is checked */ @Override public final void setLeavesTheBattlefieldTrigger(boolean leavesTheBattlefieldTrigger) { From 396f3b73b12d61b452f4f9a79b4b384a2a0f0d9e Mon Sep 17 00:00:00 2001 From: Dilnu Date: Fri, 23 Sep 2016 21:19:51 -0400 Subject: [PATCH 2/2] Propagate Applied Effects with the Flashback Replacement Effect MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a bug that allows replacement loops when other replacement effects conflict with Flashback’s attempts to exile Flashbacked spells. --- .../src/main/java/mage/abilities/keyword/FlashbackAbility.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java b/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java index c32dc61b56..214d84e9c5 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java @@ -274,7 +274,8 @@ class FlashbackReplacementEffect extends ReplacementEffectImpl { if (controller != null) { Card card = game.getCard(event.getTargetId()); if (card != null) { - return controller.moveCards(card, Zone.EXILED, source, game); + return controller.moveCards( + card, Zone.EXILED, source, game, false, false, false, event.getAppliedEffects()); } } return false;