From 0c03cf6797b5ae303c715815f6c6195518dd8133 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Fri, 1 Feb 2013 19:54:27 +0100
Subject: [PATCH] Fixed a problem with the tests and the logic that opponents
 can activate activatedAbilities.

---
 Mage/src/mage/abilities/AbilityImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/mage/abilities/AbilityImpl.java
index 80a1cdb4a3..1eae2f5fa4 100644
--- a/Mage/src/mage/abilities/AbilityImpl.java
+++ b/Mage/src/mage/abilities/AbilityImpl.java
@@ -278,7 +278,7 @@ public abstract class AbilityImpl<T extends AbilityImpl<T>> implements Ability {
 
         //20100716 - 601.2g
         UUID activatorId = controllerId;
-        if (this instanceof ActivatedAbilityImpl) {
+        if ((this instanceof ActivatedAbilityImpl) && ((ActivatedAbilityImpl)this).getActivatorId()!= null) {
              activatorId = ((ActivatedAbilityImpl)this).getActivatorId();
         }
         if (!costs.pay(this, game, sourceId, activatorId, noMana)) {