From d3ac169d03c5ee0c505d2333f9c4d4553310e47f Mon Sep 17 00:00:00 2001
From: swordshine <swordshine@cardforge.org>
Date: Wed, 24 Apr 2013 12:19:44 +0000
Subject: [PATCH] - Added Taunt

---
 .gitattributes                                            | 1 +
 res/cardsfolder/t/taunt.txt                               | 8 ++++++++
 .../java/forge/card/ability/effects/MustAttackEffect.java | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 res/cardsfolder/t/taunt.txt

diff --git a/.gitattributes b/.gitattributes
index 7f2885025b3..9aaf531bf98 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10793,6 +10793,7 @@ res/cardsfolder/t/tattermunge_duo.txt svneol=native#text/plain
 res/cardsfolder/t/tattermunge_maniac.txt svneol=native#text/plain
 res/cardsfolder/t/tattermunge_witch.txt svneol=native#text/plain
 res/cardsfolder/t/tattoo_ward.txt -text
+res/cardsfolder/t/taunt.txt -text
 res/cardsfolder/t/taunting_challenge.txt svneol=native#text/plain
 res/cardsfolder/t/taunting_elf.txt svneol=native#text/plain
 res/cardsfolder/t/taurean_mauler.txt svneol=native#text/plain
diff --git a/res/cardsfolder/t/taunt.txt b/res/cardsfolder/t/taunt.txt
new file mode 100644
index 00000000000..4c85ab3e46f
--- /dev/null
+++ b/res/cardsfolder/t/taunt.txt
@@ -0,0 +1,8 @@
+Name:Taunt
+ManaCost:U
+Types:Sorcery
+A:SP$ MustAttack | Cost$ U | ValidTgts$ Player | TgtPrompt$ Select target player | Defender$ You | SpellDescription$ During target player's next turn, creatures that player controls attack you if able.
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/taunt.jpg
+Oracle:During target player's next turn, creatures that player controls attack you if able.
+SetInfo:POR Rare
\ No newline at end of file
diff --git a/src/main/java/forge/card/ability/effects/MustAttackEffect.java b/src/main/java/forge/card/ability/effects/MustAttackEffect.java
index 05d58e106e8..9a82e8e4755 100644
--- a/src/main/java/forge/card/ability/effects/MustAttackEffect.java
+++ b/src/main/java/forge/card/ability/effects/MustAttackEffect.java
@@ -28,7 +28,7 @@ public class MustAttackEffect extends SpellAbilityEffect {
         if (sa.getParam("Defender").equals("Self")) {
             defender = host.toString();
         } else {
-            // TODO - if more needs arise in the future
+            defender = host.getController().toString();
         }
 
         for (final Player player : tgtPlayers) {