From cf8fa2b773ad7f814c08a9112618b53b0858ec18 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Sun, 3 Jun 2012 16:28:28 +0400
Subject: [PATCH] Fixed triggered abilities under opponent's control. +1 test
 passed.

---
 Mage/src/mage/abilities/TriggeredAbilities.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Mage/src/mage/abilities/TriggeredAbilities.java b/Mage/src/mage/abilities/TriggeredAbilities.java
index 94360f8235..8ba27bb578 100644
--- a/Mage/src/mage/abilities/TriggeredAbilities.java
+++ b/Mage/src/mage/abilities/TriggeredAbilities.java
@@ -31,6 +31,7 @@ package mage.abilities;
 import mage.MageObject;
 import mage.game.Game;
 import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -58,8 +59,12 @@ public class TriggeredAbilities extends HashMap<UUID, TriggeredAbility> {
                     object = game.getObject(ability.getSourceId());
                 }
                 if (object != null && object.getAbilities().contains(ability)) {
+                    if (object instanceof Permanent) {
+                        ability.setControllerId(((Permanent) object).getControllerId());
+                    }
                     if (ability.checkTrigger(event, game)) {
-                        ability.trigger(game, ability.getControllerId());
+                        UUID controllerId = ability.getControllerId();
+                        ability.trigger(game, controllerId);
                     }
                 }
             }