github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Mirror Mockery - Fixed that the triggered ability on the stack did not resolve if Mirror Mockery had left battlefield meanwhile.

Browse source
This commit is contained in:
LevelX2 2015-04-27 08:24:14 +02:00
parent 7af6d76f02
commit 890ef2e151
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/dragonsoftarkir/IcefallRegent.java
View file

@ -137,7 +137,7 @@ class IcefallRegentEffect extends ContinuousRuleModifyingEffectImpl {
// event will happen before this effect is applied ever) // event will happen before this effect is applied ever)
Permanent sourcePermanent = game.getPermanent(source.getSourceId()); Permanent sourcePermanent = game.getPermanent(source.getSourceId());
if (sourcePermanent == null || !sourcePermanent.getControllerId().equals(source.getControllerId())) { if (sourcePermanent == null || !sourcePermanent.getControllerId().equals(source.getControllerId())) {
this.used = true; discard();
return false; return false;
} }
if (event.getType() == GameEvent.EventType.LOST_CONTROL) { if (event.getType() == GameEvent.EventType.LOST_CONTROL) {

4
Mage.Sets/src/mage/sets/dragonsoftarkir/MirrorMockery.java
View file

@ -99,11 +99,11 @@ class MirrorMockeryEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { 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) { if (enchantment == null || enchantment.getAttachedTo() == null) {
return false; return false;
} }
Permanent enchanted = game.getPermanent(enchantment.getAttachedTo()); Permanent enchanted = game.getPermanentOrLKIBattlefield(enchantment.getAttachedTo());
if (enchanted != null) { if (enchanted != null) {
EmptyToken token = new EmptyToken(); EmptyToken token = new EmptyToken();
CardUtil.copyTo(token).from(enchanted); CardUtil.copyTo(token).from(enchanted);