From 67ae37f55fbd73bf0ef98cd12b2211ec772e70fa Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Thu, 8 Mar 2012 21:36:57 +0000
Subject: [PATCH] - "Leaping Blaze" should now work correctly.

---
 .../com/gempukku/lotro/cards/set3/gondor/Card3_048.java   | 6 ++++--
 .../com/gempukku/lotro/cards/set5/dunland/Card5_003.java  | 8 ++++++--
 .../gemp-lotr-web/src/main/webapp/includes/changeLog.html | 1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_048.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_048.java
index 3e7bb7333..0839878d6 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_048.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_048.java
@@ -2,6 +2,7 @@ package com.gempukku.lotro.cards.set3.gondor;
 
 import com.gempukku.lotro.cards.AbstractResponseOldEvent;
 import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.TriggerConditions;
 import com.gempukku.lotro.cards.actions.PlayEventAction;
 import com.gempukku.lotro.cards.effects.AddUntilStartOfPhaseModifierEffect;
 import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect;
@@ -38,8 +39,9 @@ public class Card3_048 extends AbstractResponseOldEvent {
 
     @Override
     public List<PlayEventAction> getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) {
-        if (effectResult.getType() == EffectResult.Type.WHEN_FELLOWSHIP_MOVES
-                && game.getGameState().getCurrentPhase() == Phase.REGROUP
+        if (TriggerConditions.moves(game, effectResult)
+                && PlayConditions.isPhase(game, Phase.REGROUP)
+                && checkPlayRequirements(playerId, game, self, 0, 0, false, false)
                 && PlayConditions.canExert(self, game, 2, Culture.GONDOR, CardType.COMPANION)) {
             PlayEventAction action = new PlayEventAction(self);
             action.appendCost(
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/dunland/Card5_003.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/dunland/Card5_003.java
index 98ee0ea9d..5217da5b3 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/dunland/Card5_003.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/dunland/Card5_003.java
@@ -4,6 +4,7 @@ import com.gempukku.lotro.cards.AbstractEvent;
 import com.gempukku.lotro.cards.PlayConditions;
 import com.gempukku.lotro.cards.actions.PlayEventAction;
 import com.gempukku.lotro.cards.effects.PreventableEffect;
+import com.gempukku.lotro.cards.effects.ShuffleCardsFromHandIntoDeckEffect;
 import com.gempukku.lotro.common.CardType;
 import com.gempukku.lotro.common.Culture;
 import com.gempukku.lotro.common.Phase;
@@ -16,6 +17,8 @@ import com.gempukku.lotro.logic.effects.DrawCardsEffect;
 import com.gempukku.lotro.logic.timing.Effect;
 import com.gempukku.lotro.logic.timing.UnrespondableEffect;
 
+import java.util.HashSet;
+
 /**
  * Set: Battle of Helm's Deep
  * Side: Shadow
@@ -37,14 +40,15 @@ public class Card5_003 extends AbstractEvent {
     }
 
     @Override
-    public PlayEventAction getPlayCardAction(final String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
+    public PlayEventAction getPlayCardAction(final String playerId, LotroGame game, final PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
         final PlayEventAction action = new PlayEventAction(self);
         action.appendEffect(
                 new PreventableEffect(action,
                         new UnrespondableEffect() {
                             @Override
                             protected void doPlayEffect(LotroGame game) {
-                                game.getGameState().shuffleCardsIntoDeck(game.getGameState().getHand(playerId), playerId);
+                                action.appendEffect(
+                                        new ShuffleCardsFromHandIntoDeckEffect(self, playerId, new HashSet<PhysicalCard>(game.getGameState().getHand(playerId))));
                                 action.appendEffect(
                                         new DrawCardsEffect(action, playerId, 8));
                             }
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
index 8a2990e4b..9ad72dce1 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
@@ -1,6 +1,7 @@
 <pre style="font-size:80%">
 <b>8 Mar. 2012</b>
 - Added set 18 (Treachery & Deceit)
+- "Leaping Blaze" should now work correctly.
 
 <b>7 Mar. 2012</b>
 - "Throne of Minas Tirith" should only trigger once now, when a minion is killed.