From 28800557f4b81002fd5a17c0cac6d7b20139ca9d Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Fri, 9 Mar 2012 10:00:12 +0000
Subject: [PATCH] - When a card stacks cards from discard, it does it now
 correctly if the number of cards in discard is exactly the same as it has to
 stack (if no selection is needed).

---
 .../effects/choose/ChooseAndStackCardsFromDiscardEffect.java  | 3 +--
 .../gemp-lotr-web/src/main/webapp/includes/changeLog.html     | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndStackCardsFromDiscardEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndStackCardsFromDiscardEffect.java
index c1e4fe7e4..87d27152b 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndStackCardsFromDiscardEffect.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndStackCardsFromDiscardEffect.java
@@ -1,7 +1,6 @@
 package com.gempukku.lotro.cards.effects.choose;
 
 import com.gempukku.lotro.cards.effects.StackCardFromDiscardEffect;
-import com.gempukku.lotro.cards.effects.StackCardFromHandEffect;
 import com.gempukku.lotro.common.Filterable;
 import com.gempukku.lotro.filters.Filters;
 import com.gempukku.lotro.game.PhysicalCard;
@@ -56,7 +55,7 @@ public class ChooseAndStackCardsFromDiscardEffect extends AbstractEffect {
         if (discard.size() <= _minimum) {
             SubAction subAction = new SubAction(_action);
             for (PhysicalCard card : discard)
-                subAction.appendEffect(new StackCardFromHandEffect(card, _stackOn));
+                subAction.appendEffect(new StackCardFromDiscardEffect(card, _stackOn));
             game.getActionsEnvironment().addActionToStack(subAction);
             stackFromDiscardCallback(discard);
         } else {
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 9ad72dce1..88206500d 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,4 +1,8 @@
 <pre style="font-size:80%">
+<b>9 Mar. 2012</b>
+- When a card stacks cards from discard, it does it now correctly if the number of cards in discard is exactly the same
+as it has to stack (if no selection is needed).
+
 <b>8 Mar. 2012</b>
 - Added set 18 (Treachery & Deceit)
 - "Leaping Blaze" should now work correctly.