From 6dd033bd8f7703f6e843d9be3554447626998a3d Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Fri, 12 Dec 2014 14:25:29 +0100
Subject: [PATCH] Some minor framework changes.

---
 .../src/mage/sets/gatecrash/ClanDefiance.java    |  2 --
 .../TapForManaAllTriggeredManaAbility.java       | 16 ++++++++--------
 .../AddManaToManaPoolTargetControllerEffect.java |  2 --
 .../mage/game/permanent/token/SpiritToken.java   |  3 +++
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java b/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java
index 8e6cf9da7f..7474913ca4 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.gatecrash;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.UUID;
 import mage.constants.CardType;
 import mage.constants.Rarity;
diff --git a/Mage/src/mage/abilities/common/TapForManaAllTriggeredManaAbility.java b/Mage/src/mage/abilities/common/TapForManaAllTriggeredManaAbility.java
index e01e9ea935..28ebe2e228 100644
--- a/Mage/src/mage/abilities/common/TapForManaAllTriggeredManaAbility.java
+++ b/Mage/src/mage/abilities/common/TapForManaAllTriggeredManaAbility.java
@@ -70,14 +70,14 @@ public class TapForManaAllTriggeredManaAbility extends TriggeredManaAbility {
                 ManaEvent mEvent = (ManaEvent) event;
                 for(Effect effect:getEffects()) {
                     effect.setValue("mana", mEvent.getMana());
-                }
-                switch(setTargetPointer) {
-                    case PERMANENT:
-                        getEffects().get(0).setTargetPointer(new FixedTarget(permanent.getId()));
-                        break;
-                    case PLAYER:
-                        getEffects().get(0).setTargetPointer(new FixedTarget(permanent.getControllerId()));
-                        break;
+                    switch(setTargetPointer) {
+                        case PERMANENT:
+                            effect.setTargetPointer(new FixedTarget(permanent.getId()));
+                            break;
+                        case PLAYER:
+                            effect.setTargetPointer(new FixedTarget(permanent.getControllerId()));
+                            break;
+                    }
                 }
                 return true;
             }
diff --git a/Mage/src/mage/abilities/effects/common/AddManaToManaPoolTargetControllerEffect.java b/Mage/src/mage/abilities/effects/common/AddManaToManaPoolTargetControllerEffect.java
index 9ed82acd32..00e02f445f 100644
--- a/Mage/src/mage/abilities/effects/common/AddManaToManaPoolTargetControllerEffect.java
+++ b/Mage/src/mage/abilities/effects/common/AddManaToManaPoolTargetControllerEffect.java
@@ -8,8 +8,6 @@ package mage.abilities.effects.common;
 
 import mage.Mana;
 import mage.abilities.Ability;
-import mage.abilities.effects.OneShotEffect;
-import mage.constants.Outcome;
 import mage.game.Game;
 import mage.players.Player;
 
diff --git a/Mage/src/mage/game/permanent/token/SpiritToken.java b/Mage/src/mage/game/permanent/token/SpiritToken.java
index 995b16139c..329e2f397f 100644
--- a/Mage/src/mage/game/permanent/token/SpiritToken.java
+++ b/Mage/src/mage/game/permanent/token/SpiritToken.java
@@ -34,8 +34,11 @@ import mage.constants.CardType;
  * @author Loki
  */
 public class SpiritToken extends Token {
+    
     public SpiritToken() {
         super("Spirit", "1/1 colorless Spirit creature token");
+
+        setOriginalExpansionSetCode("CHK");
         cardType.add(CardType.CREATURE);
         subtype.add("Spirit");
         power = new MageInt(1);