From dcc9828f0feb8b028d1bd7ceaa25ee627978838a Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 11 Mar 2013 17:33:50 +0100
Subject: [PATCH] Fixed a bug of Curse of Exhaustion checking always
 controlling player.

---
 .../src/mage/sets/darkascension/CurseOfExhaustion.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java
index effcaeced1..753c59c137 100644
--- a/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java
+++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java
@@ -97,8 +97,9 @@ class CurseOfExhaustionWatcher extends WatcherImpl<CurseOfExhaustionWatcher> {
 
     @Override
     public void watch(GameEvent event, Game game) {
-        if (condition == true) //no need to check - condition has already occured
+        if (condition == true) {//no need to check - condition has already occured
             return;
+        }
         if (event.getType() == GameEvent.EventType.SPELL_CAST ) {
             Permanent enchantment = game.getPermanent(this.sourceId);
             if (enchantment != null && enchantment.getAttachedTo() != null) {
@@ -116,7 +117,7 @@ class CurseOfExhaustionEffect extends ReplacementEffectImpl<CurseOfExhaustionEff
 
     public CurseOfExhaustionEffect() {
         super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit);
-        staticText = "Enchanted player can't cast more than one spell each turn.";
+        staticText = "Enchanted player can't cast more than one spell each turn";
     }
 
     public CurseOfExhaustionEffect(final CurseOfExhaustionEffect effect) {
@@ -145,9 +146,10 @@ class CurseOfExhaustionEffect extends ReplacementEffectImpl<CurseOfExhaustionEff
             if (enchantment != null && enchantment.getAttachedTo() != null) {
                 Player player = game.getPlayer(enchantment.getAttachedTo());
                 if (player != null && event.getPlayerId().equals(player.getId())) {
-                    Watcher watcher = game.getState().getWatchers().get("SpellCast", source.getControllerId());
-                    if (watcher != null && watcher.conditionMet())
+                    Watcher watcher = game.getState().getWatchers().get("SpellCast", player.getId());
+                    if (watcher != null && watcher.conditionMet()) {
                         return true;
+                    }
                 }
             }
         }