From 7a073c8d94d0a6e2d6cc22995eb623da4c4e4aba Mon Sep 17 00:00:00 2001 From: swordshine Date: Wed, 21 Jan 2015 12:22:27 +0000 Subject: [PATCH] - Fixed Mindstab Thrull --- forge-game/src/main/java/forge/game/combat/Combat.java | 1 + .../main/java/forge/game/trigger/TriggerAttackerUnblocked.java | 1 + forge-gui/res/cardsfolder/m/mindstab_thrull.txt | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/combat/Combat.java b/forge-game/src/main/java/forge/game/combat/Combat.java index e09da0d6ba6..ba489ed528c 100644 --- a/forge-game/src/main/java/forge/game/combat/Combat.java +++ b/forge-game/src/main/java/forge/game/combat/Combat.java @@ -505,6 +505,7 @@ public class Combat { final HashMap runParams = new HashMap(); runParams.put("Attacker", attacker); runParams.put("Defender",getDefenderByAttacker(attacker)); + runParams.put("DefendingPlayer", getDefenderPlayerByAttacker(attacker)); attacker.getGame().getTriggerHandler().runTrigger(TriggerType.AttackerUnblocked, runParams, false); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java index 60346862054..7acb197fc43 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java @@ -71,5 +71,6 @@ public class TriggerAttackerUnblocked extends Trigger { public final void setTriggeringObjects(final SpellAbility sa) { sa.setTriggeringObject("Attacker", this.getRunParams().get("Attacker")); sa.setTriggeringObject("Defender", this.getRunParams().get("Defender")); + sa.setTriggeringObject("DefendingPlayer", this.getRunParams().get("DefendingPlayer")); } } diff --git a/forge-gui/res/cardsfolder/m/mindstab_thrull.txt b/forge-gui/res/cardsfolder/m/mindstab_thrull.txt index 69d5e85284f..6bff25df13b 100644 --- a/forge-gui/res/cardsfolder/m/mindstab_thrull.txt +++ b/forge-gui/res/cardsfolder/m/mindstab_thrull.txt @@ -3,6 +3,6 @@ ManaCost:1 B B Types:Creature Thrull PT:2/2 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may sacrifice it. If you do, defending player discards three cards. -SVar:TrigDiscard:AB$ Discard | Cost$ Sac<1/CARDNAME> | Defined$ DefendingPlayer | NumCards$ 3 | AILogic$ AtLeast2 | Mode$ TgtChoose +SVar:TrigDiscard:AB$ Discard | Cost$ Sac<1/CARDNAME> | Defined$ TriggeredDefendingPlayer | NumCards$ 3 | AILogic$ AtLeast2 | Mode$ TgtChoose SVar:Picture:http://www.wizards.com/global/images/magic/general/mindstab_thrull.jpg Oracle:Whenever Mindstab Thrull attacks and isn't blocked, you may sacrifice it. If you do, defending player discards three cards.