From 9aba48185dd983a6abf5347a7ef5b175e5d467ea Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Thu, 8 Mar 2018 11:37:38 -0500 Subject: [PATCH] Fix to The Hobbit "Gandalf, Leader of Dwarves" Properly discard 2 Dwarf followers to replay from discard --- .../lotro/cards/set30/gandalf/Card30_025.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_025.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_025.java index 1e9d7c443..ebf9f62c6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_025.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_025.java @@ -52,16 +52,18 @@ public class Card30_025 extends AbstractCompanion { return null; } - @Override - public List getPhaseActionsFromDiscard(String playerId, LotroGame game, final PhysicalCard self) { + @Override + public List getPhaseActionsFromDiscard(String playerId, LotroGame game, final PhysicalCard self) { if (PlayConditions.isPhase(game, Phase.MANEUVER) - && (PlayConditions.canDiscardFromPlay(self, game, 2, Race.DWARF, CardType.FOLLOWER)) - && (PlayConditions.canPlayFromDiscard(playerId, game, self))) { - ActivateCardAction action = new ActivateCardAction(self); - action.appendCost( - new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 2, 2, Race.DWARF, CardType.FOLLOWER)); - return Collections.singletonList(getPlayCardAction(playerId, game, self, 0, false)); + && (PlayConditions.canDiscardFromPlay(self, game, 2, Race.DWARF, CardType.FOLLOWER)) + && (PlayConditions.canPlayFromDiscard(playerId, game, self))) { + ActivateCardAction replayGandalf = new ActivateCardAction(self); + replayGandalf.appendCost( + new ChooseAndDiscardCardsFromPlayEffect(replayGandalf, playerId, 2, 2, Race.DWARF, CardType.FOLLOWER)); + replayGandalf.appendEffect( + new ChooseAndPlayCardFromDiscardEffect(playerId, game, self)); + return Collections.singletonList(replayGandalf); } return null; - } + } }