From d3fb1d8b22a34b72cb8f034f8c11aeee13a71dcc Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 5 Dec 2011 05:46:24 +0000 Subject: [PATCH] Cards played as attachment count for initiative until "Play" is triggered. --- .../lotro/cards/actions/AttachPermanentAction.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentAction.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentAction.java index 93f51dfd2..5078e5ec4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentAction.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentAction.java @@ -117,7 +117,10 @@ public class AttachPermanentAction extends AbstractCostToEffectAction implements public Effect nextEffect(LotroGame game) { if (!_cardRemoved) { _cardRemoved = true; + boolean fromHand = (_cardToAttach.getZone() == Zone.HAND); game.getGameState().removeCardsFromZone(_cardToAttach.getOwner(), Collections.singleton(_cardToAttach)); + if (fromHand) + game.getGameState().addCardToZone(game, _cardToAttach, Zone.VOID); } if (!_targetChosen) { @@ -173,12 +176,16 @@ public class AttachPermanentAction extends AbstractCostToEffectAction implements } else { if (!_cardDiscarded) { _cardDiscarded = true; + if (_cardToAttach.getZone() != null) + game.getGameState().removeCardsFromZone(_cardToAttach.getOwner(), Collections.singleton(_cardToAttach)); game.getGameState().addCardToZone(game, _cardToAttach, Zone.DISCARD); } } } else { if (!_cardDiscarded) { _cardDiscarded = true; + if (_cardToAttach.getZone() != null) + game.getGameState().removeCardsFromZone(_cardToAttach.getOwner(), Collections.singleton(_cardToAttach)); game.getGameState().addCardToZone(game, _cardToAttach, Zone.DISCARD); } }