From f93090ebd692163358ea697abdcffea9161a503d Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Sat, 3 Mar 2012 09:57:55 +0000
Subject: [PATCH] - Added Karrthus, Tyrant of Jund.

---
 .gitattributes                                    |  1 +
 res/cardsfolder/a/aura_thief.txt                  |  2 +-
 res/cardsfolder/k/karrthus_tyrant_of_jund.txt     | 15 +++++++++++++++
 .../abilityfactory/AbilityFactoryGainControl.java |  5 ++---
 4 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 res/cardsfolder/k/karrthus_tyrant_of_jund.txt

diff --git a/.gitattributes b/.gitattributes
index 24784993824..1153b71af8f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4644,6 +4644,7 @@ res/cardsfolder/k/karplusan_giant.txt svneol=native#text/plain
 res/cardsfolder/k/karplusan_strider.txt svneol=native#text/plain
 res/cardsfolder/k/karplusan_wolverine.txt svneol=native#text/plain
 res/cardsfolder/k/karplusan_yeti.txt svneol=native#text/plain
+res/cardsfolder/k/karrthus_tyrant_of_jund.txt -text
 res/cardsfolder/k/karstoderm.txt svneol=native#text/plain
 res/cardsfolder/k/kashi_tribe_elite.txt svneol=native#text/plain
 res/cardsfolder/k/kashi_tribe_reaver.txt svneol=native#text/plain
diff --git a/res/cardsfolder/a/aura_thief.txt b/res/cardsfolder/a/aura_thief.txt
index 0330add5759..bf397e72c10 100644
--- a/res/cardsfolder/a/aura_thief.txt
+++ b/res/cardsfolder/a/aura_thief.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:2/2
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigGainControl | TriggerDescription$ When CARDNAME dies, you gain control of all enchantments. (You don't get to move Auras.)
-SVar:TrigGainControl:DB$ GainControl | AllValid$ Enchantment
+SVar:TrigGainControl:DB$ GainControl | AllValid$ Enchantment | NewController$ You
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aura_thief.jpg
 SetInfo:UDS|Rare|http://magiccards.info/scans/en/ud/26.jpg
diff --git a/res/cardsfolder/k/karrthus_tyrant_of_jund.txt b/res/cardsfolder/k/karrthus_tyrant_of_jund.txt
new file mode 100644
index 00000000000..23576c54936
--- /dev/null
+++ b/res/cardsfolder/k/karrthus_tyrant_of_jund.txt
@@ -0,0 +1,15 @@
+Name:Karrthus, Tyrant of Jund
+ManaCost:4 B R G
+Types:Legendary Creature Dragon
+Text:no text
+PT:7/7
+K:Flying
+K:Haste
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainControl | TriggerDescription$ When CARDNAME enters the battlefield, gain control of all Dragons, then untap all Dragons.
+SVar:TrigGainControl:DB$ GainControl | AllValid$ Dragon | Untap$ True | NewController$ You
+S:Mode$ Continuous | Affected$ Creature.Dragon+Other+YouCtrl | AddKeyword$ Haste | Description$ Other Dragon creatures you control have haste.
+SVar:Rarity:Mythic
+SVar:Picture:http://www.wizards.com/global/images/magic/general/karrthus_tyrant_of_jund.jpg
+SetInfo:ARB|Mythic|http://magiccards.info/scans/en/arb/117.jpg
+Oracle:Flying, haste\nWhen Karrthus, Tyrant of Jund enters the battlefield, gain control of all Dragons, then untap all Dragons.\nOther Dragon creatures you control have haste.
+End
\ No newline at end of file
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryGainControl.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryGainControl.java
index 874a6479767..e22d40e5207 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryGainControl.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryGainControl.java
@@ -391,7 +391,6 @@ public class AbilityFactoryGainControl {
      */
     private void gainControlResolve(final SpellAbility sa) {
         CardList tgtCards = new CardList();
-        final boolean self = this.params.containsKey("Defined") && this.params.get("Defined").equals("Self");
 
         final Target tgt = sa.getTarget();
         if (this.params.containsKey("AllValid")) {
@@ -426,11 +425,11 @@ public class AbilityFactoryGainControl {
             final Player originalController = tgtC.getController();
 
             this.movedCards.add(tgtC);
-            if (!self) {
+            if (!tgtC.equals(this.hostCard)) {
                 this.hostCard.addGainControlTarget(tgtC);
             }
 
-            if (AllZoneUtil.isCardInPlay(tgtC) && tgtC.canBeTargetedBy(sa)) {
+            if (AllZoneUtil.isCardInPlay(tgtC)) {
 
                 tgtC.addController(newController);
                 // Singletons.getModel().getGameAction().changeController(new CardList(tgtC),