From 561b8f95bf03b0508792df124862edaa7e5f9f40 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Sat, 16 Mar 2013 14:59:46 +0000
Subject: [PATCH] - Removed some unnecessary addController calls.

---
 src/main/java/forge/card/ability/effects/EffectEffect.java | 4 +---
 src/main/java/forge/card/ability/effects/PlayEffect.java   | 2 --
 src/main/java/forge/card/cardfactory/CardFactoryUtil.java  | 1 -
 src/main/java/forge/game/GameNew.java                      | 1 -
 src/main/java/forge/gui/GuiDisplayUtil.java                | 1 -
 5 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main/java/forge/card/ability/effects/EffectEffect.java b/src/main/java/forge/card/ability/effects/EffectEffect.java
index d2608001f07..f1c0896bfeb 100644
--- a/src/main/java/forge/card/ability/effects/EffectEffect.java
+++ b/src/main/java/forge/card/ability/effects/EffectEffect.java
@@ -100,9 +100,7 @@ public class EffectEffect extends SpellAbilityEffect {
         final Card eff = new Card();
         eff.setName(name);
         eff.addType("Effect"); // Or Emblem
-        eff.setToken(true); // Set token to true, so when leaving play it gets
-                            // nuked
-        eff.addController(controller);
+        eff.setToken(true); // Set token to true, so when leaving play it gets nuked
         eff.setOwner(controller);
         eff.setImageFilename(sa.hasParam("Image") ? sa.getParam("Image") : hostCard.getImageFilename());
         eff.setColor(hostCard.getColor());
diff --git a/src/main/java/forge/card/ability/effects/PlayEffect.java b/src/main/java/forge/card/ability/effects/PlayEffect.java
index 95e2e947c9a..40d995d07c7 100644
--- a/src/main/java/forge/card/ability/effects/PlayEffect.java
+++ b/src/main/java/forge/card/ability/effects/PlayEffect.java
@@ -151,8 +151,6 @@ public class PlayEffect extends SpellAbilityEffect {
             }
             if (sa.hasParam("CopyCard")) {
                 tgtCard = CardDb.getCard(tgtCard).toForgeCard(sa.getActivatingPlayer());
-                // when copying something stolen:
-                tgtCard.addController(sa.getActivatingPlayer());
 
                 tgtCard.setToken(true);
                 tgtCard.setCopiedSpell(true);
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
index 457dc1e448c..58de6f1bc06 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
@@ -3171,7 +3171,6 @@ public class CardFactoryUtil {
                     eff.addType("Effect"); // Or Emblem
                     eff.setToken(true); // Set token to true, so when leaving
                                         // play it gets nuked
-                    eff.addController(card.getController());
                     eff.setOwner(card.getController());
                     eff.setColor(card.getColor());
                     eff.setImmutable(true);
diff --git a/src/main/java/forge/game/GameNew.java b/src/main/java/forge/game/GameNew.java
index 9237478b61b..28f4029ee9a 100644
--- a/src/main/java/forge/game/GameNew.java
+++ b/src/main/java/forge/game/GameNew.java
@@ -334,7 +334,6 @@ public class GameNew {
             for (final IPaperCard cp : cards) {
                 Card c = cp.toForgeCard(player);
                 c.setOwner(player);
-                c.addController(player);
                 bf.add(c, false);
                 c.setSickness(true);
                 c.setStartsGameInPlay(true);
diff --git a/src/main/java/forge/gui/GuiDisplayUtil.java b/src/main/java/forge/gui/GuiDisplayUtil.java
index fb99dc6afc9..79abe02e817 100644
--- a/src/main/java/forge/gui/GuiDisplayUtil.java
+++ b/src/main/java/forge/gui/GuiDisplayUtil.java
@@ -146,7 +146,6 @@ public final class GuiDisplayUtil {
         final Card dummy = new Card();
         final Player human = Singletons.getControl().getPlayer();
         dummy.setOwner(human);
-        dummy.addController(human);
         Map<String, String> produced = new HashMap<String, String>();
         produced.put("Produced", "W W W W W W W U U U U U U U B B B B B B B G G G G G G G R R R R R R R 7");
         final AbilityManaPart abMana = new AbilityManaPart(dummy, produced);