From d21f173e76774c046bc8a0dba8b26007411607ce Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 19 Jun 2014 16:51:41 +0200 Subject: [PATCH] * Tidebinder Mage - Fixed that his ability prevented untapping of the targeted creature also if it#s not the turn of the controller of the targeted creature. --- Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java b/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java index 41f2d62aa5c..ab31c997656 100644 --- a/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java +++ b/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java @@ -150,10 +150,12 @@ class TidebinderMageEffect extends ReplacementEffectImpl { if (game.getTurn().getStepType() == PhaseStep.UNTAP && event.getType() == GameEvent.EventType.UNTAP) { if (event.getTargetId().equals(targetPointer.getFirst(game, source))) { - return true; + Permanent permanent = game.getPermanent(event.getTargetId()); + if (permanent != null && game.getActivePlayerId().equals(permanent.getControllerId())) { + return true; + } } } - return false; } } @@ -180,7 +182,6 @@ class TidebinderMageWatcher extends Watcher { if (zEvent.getFromZone() == Zone.BATTLEFIELD) { condition = true; game.replaceEvent(event); - return; } } }