diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_083.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_083.java index 1f8c19294..1093bab8d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_083.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_083.java @@ -15,6 +15,7 @@ import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.modifiers.StrengthModifier; import com.gempukku.lotro.logic.timing.EffectResult; +import java.util.Collection; import java.util.Collections; import java.util.List; @@ -41,7 +42,8 @@ public class Card7_083 extends AbstractEvent { protected void cardSelected(LotroGame game, final PhysicalCard card) { game.getModifiersEnvironment().addUntilEndOfPhaseModifier( new StrengthModifier(self, card, 2), Phase.SKIRMISH); - if (Filters.inSkirmishAgainst(Culture.SAURON, CardType.MINION).accepts(game.getGameState(), game.getModifiersQuerying(), card)) { + final Collection sauronMinions = Filters.filterActive(game.getGameState(), game.getModifiersQuerying(), Culture.SAURON, CardType.MINION, Filters.inSkirmishAgainst(card)); + if (sauronMinions.size() > 0) { action.appendEffect( new AddUntilEndOfPhaseActionProxyEffect( new AbstractActionProxy() { @@ -50,7 +52,7 @@ public class Card7_083 extends AbstractEvent { if (TriggerConditions.endOfPhase(game, effectResult, Phase.SKIRMISH)) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Culture.SAURON, CardType.MINION, Filters.inSkirmishAgainst(card))); + new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Filters.in(sauronMinions))); return Collections.singletonList(action); } return null; 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 776c2ef46..ddcfd85fb 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 @@
+14 May 2012
+- "City of Men" should now correctly discard a minion at the end of the skirmish.
+
 13 May 2012
 - "Isengard Ruined" should now correctly allow to exert companion twice.
 - "Ulaire Otsea, Ringwraith in Twilight" and "Morgul Blade" no longer allow to attach Blade Tip to a character that