From 2ac54d2c6ed95db9607da8c309f2e0a17e2977d1 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sat, 10 Mar 2018 23:05:44 -0500 Subject: [PATCH] Fix to 7R182 "Loathsome" Can now properly be played, even if all Nazgul are removed from the skirmish before it ends --- .../lotro/cards/set7/wraith/Card7_182.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/wraith/Card7_182.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/wraith/Card7_182.java index d774a15f7..0c323455b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/wraith/Card7_182.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/wraith/Card7_182.java @@ -11,6 +11,7 @@ import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.timing.EffectResult; +import com.gempukku.lotro.logic.timing.results.SkirmishAboutToEndResult; import java.util.Collections; import java.util.List; @@ -32,12 +33,17 @@ public class Card7_182 extends AbstractResponseEvent { @Override public List getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (effectResult.getType() == EffectResult.Type.SKIRMISH_ABOUT_TO_END - && checkPlayRequirements(playerId, game, self, 0, 0, false, false) - && Filters.filter(game.getGameState().getSkirmish().getShadowCharacters(), game.getGameState(), game.getModifiersQuerying(), Race.NAZGUL).size() > 0) { - PlayEventAction action = new PlayEventAction(self); - action.appendEffect( - new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.POSSESSION, Filters.attachedTo(CardType.COMPANION, Filters.inSkirmish))); - return Collections.singletonList(action); + && checkPlayRequirements(playerId, game, self, 0, 0, false, false)) { + SkirmishAboutToEndResult checkSkirmish = (SkirmishAboutToEndResult) effectResult; + for (PhysicalCard minion: checkSkirmish.getMinionsInvolved()) { + if (minion.getBlueprint().getRace() == Race.NAZGUL) { + PlayEventAction action = new PlayEventAction(self); + action.appendEffect( + new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.POSSESSION, Filters.attachedTo( + CardType.COMPANION, Filters.inSkirmish))); + return Collections.singletonList(action); + } + } } return null; }