From 1ca177253eec7373521b0a8cc253c60a7619aaa5 Mon Sep 17 00:00:00 2001
From: TRT <>
Date: Thu, 3 Mar 2022 10:42:54 +0100
Subject: [PATCH] ControlSpell: Add extra check

---
 .../java/forge/game/ability/effects/ControlSpellEffect.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java
index 8b371414c48..c27745fc1af 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java
@@ -41,7 +41,6 @@ public class ControlSpellEffect extends SpellAbilityEffect {
         return sb.toString();
     }
 
-
     @Override
     public void resolve(SpellAbility sa) {
         // Gaining Control of Spells is a permanent effect
@@ -98,8 +97,10 @@ public class ControlSpellEffect extends SpellAbilityEffect {
             if (remember) {
                 source.addRemembered(tgtC);
             }
+            if (tgtC.getController() != newController) {
+                tgtC.runChangeControllerCommands();
+            }
             tgtC.addTempController(newController, tStamp);
-            tgtC.runChangeControllerCommands();
             si.setActivatingPlayer(newController);
         }
     }