From 890ef2e151ce8f8bad61e50f41837ea4f9eebaf2 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 27 Apr 2015 08:24:14 +0200 Subject: [PATCH] * Mirror Mockery - Fixed that the triggered ability on the stack did not resolve if Mirror Mockery had left battlefield meanwhile. --- Mage.Sets/src/mage/sets/dragonsoftarkir/IcefallRegent.java | 2 +- Mage.Sets/src/mage/sets/dragonsoftarkir/MirrorMockery.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/IcefallRegent.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/IcefallRegent.java index 050adf87c4..9ad9275495 100644 --- a/Mage.Sets/src/mage/sets/dragonsoftarkir/IcefallRegent.java +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/IcefallRegent.java @@ -137,7 +137,7 @@ class IcefallRegentEffect extends ContinuousRuleModifyingEffectImpl { // event will happen before this effect is applied ever) Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (sourcePermanent == null || !sourcePermanent.getControllerId().equals(source.getControllerId())) { - this.used = true; + discard(); return false; } if (event.getType() == GameEvent.EventType.LOST_CONTROL) { diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/MirrorMockery.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/MirrorMockery.java index 84029470b9..ef10e70c1d 100644 --- a/Mage.Sets/src/mage/sets/dragonsoftarkir/MirrorMockery.java +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/MirrorMockery.java @@ -99,11 +99,11 @@ class MirrorMockeryEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent enchantment = game.getPermanent(source.getSourceId()); + Permanent enchantment = game.getPermanentOrLKIBattlefield(source.getSourceId()); if (enchantment == null || enchantment.getAttachedTo() == null) { return false; } - Permanent enchanted = game.getPermanent(enchantment.getAttachedTo()); + Permanent enchanted = game.getPermanentOrLKIBattlefield(enchantment.getAttachedTo()); if (enchanted != null) { EmptyToken token = new EmptyToken(); CardUtil.copyTo(token).from(enchanted);