From 01ab00a48039428097cd683c69a376c340811204 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 17 Jan 2012 10:28:10 +0000 Subject: [PATCH] - "Deagol" should be able to play an artifact or possession without freezing the game. --- .../com/gempukku/lotro/cards/set13/gollum/Card13_046.java | 6 ++++-- .../gemp-lotr-web/src/main/webapp/includes/changeLog.html | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gollum/Card13_046.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gollum/Card13_046.java index a0e1d531d..789ab0e83 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gollum/Card13_046.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gollum/Card13_046.java @@ -60,6 +60,8 @@ public class Card13_046 extends AbstractFollower { && PlayConditions.canSpot(game, Filters.hasAttached(self), Filters.notAssignedToSkirmish) && PlayConditions.canSelfDiscard(self, game)) { + final PhysicalCard attachedTo = self.getAttachedTo(); + ActivateCardAction action = new ActivateCardAction(self); action.appendCost( new SelfDiscardEffect(self)); @@ -68,12 +70,12 @@ public class Card13_046 extends AbstractFollower { new ChooseArbitraryCardsEffect(playerId, "Choose card to play", game.getGameState().getDeck(playerId), Filters.and( Filters.or(CardType.ARTIFACT, CardType.POSSESSION), - ExtraFilters.attachableTo(game, self.getAttachedTo())), 1, 1) { + ExtraFilters.attachableTo(game, attachedTo)), 1, 1) { @Override protected void cardsSelected(LotroGame game, Collection selectedCards) { if (selectedCards.size() > 0) { PhysicalCard selectedCard = selectedCards.iterator().next(); - game.getActionsEnvironment().addActionToStack(((AbstractAttachable) selectedCard.getBlueprint()).getPlayCardAction(playerId, game, selectedCard, self.getAttachedTo(), 0)); + game.getActionsEnvironment().addActionToStack(((AbstractAttachable) selectedCard.getBlueprint()).getPlayCardAction(playerId, game, selectedCard, attachedTo, 0)); } } }); 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 c410eab5d..92edeabb5 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,7 @@
+17 Jan. 2012
+- "Deagol" should be able to play an artifact or possession without freezing the game.
+
 16 Jan. 2012
 - "Fearless" should now be giving a proper bonus to the minion.
 - "Orthanc Warrior" has a proper name now.