From 081879bca41ece12e129795b0a256bc3685022ad Mon Sep 17 00:00:00 2001 From: Sloth Date: Tue, 28 May 2013 07:34:46 +0000 Subject: [PATCH] - Fixed AttackerBlocked triggers. --- res/cardsfolder/m/minion_reflector.txt | 1 + src/main/java/forge/game/phase/CombatUtil.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/res/cardsfolder/m/minion_reflector.txt b/res/cardsfolder/m/minion_reflector.txt index 62e5568fd82..aa1cf0eee91 100644 --- a/res/cardsfolder/m/minion_reflector.txt +++ b/res/cardsfolder/m/minion_reflector.txt @@ -3,6 +3,7 @@ ManaCost:5 Types:Artifact T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigCopy | OptionalDecider$ You | TriggerDescription$ Whenever a nontoken creature enters the battlefield under your control, you may pay 2. If you do, put a token that's a copy of that creature onto the battlefield. That token has haste and "At the beginning of the end step, sacrifice this permanent." SVar:TrigCopy:AB$CopyPermanent | Cost$ 2 | Defined$ TriggeredCard | Keywords$ Haste | AtEOT$ Sacrifice +SVar:BuffedBy:Creature SVar:Picture:http://www.wizards.com/global/images/magic/general/minion_reflector.jpg Oracle:Whenever a nontoken creature enters the battlefield under your control, you may pay {2}. If you do, put a token that's a copy of that creature onto the battlefield. That token has haste and "At the beginning of the end step, sacrifice this permanent." SetInfo:ALA Rare \ No newline at end of file diff --git a/src/main/java/forge/game/phase/CombatUtil.java b/src/main/java/forge/game/phase/CombatUtil.java index 9f42845eabd..d0f550c18bd 100644 --- a/src/main/java/forge/game/phase/CombatUtil.java +++ b/src/main/java/forge/game/phase/CombatUtil.java @@ -1180,7 +1180,10 @@ public class CombatUtil { * a {@link forge.Card} object. */ public static void checkBlockedAttackers(final GameState game, final Card a, final List blockers) { - // System.out.println(a.getName() + " got blocked by " + b.getName()); + + if (blockers.isEmpty()) { + return; + } // Run triggers final HashMap runParams = new HashMap(); @@ -1188,7 +1191,6 @@ public class CombatUtil { runParams.put("Blockers", blockers); runParams.put("NumBlockers", blockers.size()); game.getTriggerHandler().runTrigger(TriggerType.AttackerBlocked, runParams, false); - //game.getTriggerHandler().runTrigger(TriggerType.Blocks, runParams, false); if (!a.getDamageHistory().getCreatureGotBlockedThisCombat()) { // Bushido