diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExchangeCardsInHandWithStackedOnEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExchangeCardsInHandWithStackedOnEffect.java index 2b9c8b2c7..915cc6f6c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExchangeCardsInHandWithStackedOnEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExchangeCardsInHandWithStackedOnEffect.java @@ -6,6 +6,7 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.timing.AbstractEffect; import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -30,16 +31,18 @@ public class ExchangeCardsInHandWithStackedOnEffect extends AbstractEffect { @Override protected FullEffectResult playEffectReturningResult(LotroGame game) { if (isPlayableInFull(game)) { - final List stackedCards = game.getGameState().getStackedCards(_stackedOn); - final List hand = game.getGameState().getHand(_playerHand); + final List stackedCards = new LinkedList(game.getGameState().getStackedCards(_stackedOn)); + final List hand = new LinkedList(game.getGameState().getHand(_playerHand)); Set toRemove = new HashSet(); toRemove.addAll(stackedCards); toRemove.addAll(hand); game.getGameState().removeCardsFromZone(_performingPlayer, toRemove); + for (PhysicalCard cardInHand : hand) game.getGameState().stackCard(game, cardInHand, _stackedOn); + for (PhysicalCard stackedCard : stackedCards) game.getGameState().addCardToZone(game, stackedCard, Zone.HAND); 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 cc0f63514..efcf7cd8a 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 @@ -4,6 +4,7 @@ - Deck statistics no longer include cancelled games. - All "add burden" actions now have a performing player and "Spirit of the White Tree" should no longer be discarded, if FP players adds a burden with an effect coming from Shadow card. +- "Hall of Our Fathers" should now correctly move your cards from hand onto the condition. 18 Nov. 2012 - "Deceit" now allows to prevent only discarding your cards.