diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromHandEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromHandEffect.java index aa7d06ba8..f8a9357bd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromHandEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromHandEffect.java @@ -53,9 +53,6 @@ public class ChooseAndPlayCardFromHandEffect implements Effect { return null; } - protected void cardPlayed(PhysicalCard cardPlayed) { - } - @Override public Collection playEffect(final LotroGame game) { Collection playableInHand = getPlayableInHandCards(game); @@ -70,7 +67,7 @@ public class ChooseAndPlayCardFromHandEffect implements Effect { new UnrespondableEffect() { @Override protected void doPlayEffect(LotroGame game) { - cardPlayed(selectedCard); + afterCardPlayed(selectedCard); } }); game.getActionsEnvironment().addActionToStack(_playCardAction); @@ -80,6 +77,9 @@ public class ChooseAndPlayCardFromHandEffect implements Effect { return null; } + protected void afterCardPlayed(PhysicalCard cardPlayed) { + } + @Override public boolean wasSuccessful() { if (_playCardAction == null) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromStackedEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromStackedEffect.java index e513cda60..0b55ee9fb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromStackedEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromStackedEffect.java @@ -72,7 +72,7 @@ public class ChooseAndPlayCardFromStackedEffect implements Effect { new UnrespondableEffect() { @Override protected void doPlayEffect(LotroGame game) { - cardPlayed(selectedCard); + afterCardPlayed(selectedCard); } }); game.getActionsEnvironment().addActionToStack(_playCardAction); @@ -83,7 +83,7 @@ public class ChooseAndPlayCardFromStackedEffect implements Effect { return null; } - protected void cardPlayed(PhysicalCard cardPlayed) { + protected void afterCardPlayed(PhysicalCard cardPlayed) { } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_009.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_009.java index 4c87a37b6..1fc719f13 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_009.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_009.java @@ -43,7 +43,7 @@ public class Card4_009 extends AbstractMinion { action.appendEffect( new ChooseAndPlayCardFromHandEffect(playerId, game.getGameState().getHand(playerId), -2, Filters.and(Filters.culture(Culture.DUNLAND), Filters.race(Race.MAN))) { @Override - protected void cardPlayed(PhysicalCard cardPlayed) { + protected void afterCardPlayed(PhysicalCard cardPlayed) { action.appendEffect( new AddUntilStartOfPhaseModifierEffect( new KeywordModifier(self, Filters.sameCard(cardPlayed), Keyword.FIERCE), Phase.REGROUP)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_023.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_023.java index 4531fb26e..78f10222f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_023.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_023.java @@ -43,7 +43,7 @@ public class Card4_023 extends AbstractMinion { action.appendEffect( new ChooseAndPlayCardFromHandEffect(playerId, game.getGameState().getHand(playerId), -2, Filters.and(Filters.culture(Culture.DUNLAND), Filters.race(Race.MAN))) { @Override - protected void cardPlayed(PhysicalCard cardPlayed) { + protected void afterCardPlayed(PhysicalCard cardPlayed) { action.appendEffect( new AddUntilStartOfPhaseModifierEffect( new KeywordModifier(self, Filters.sameCard(cardPlayed), Keyword.FIERCE), Phase.REGROUP)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_038.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_038.java index cca11196d..db172c2b2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_038.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_038.java @@ -43,7 +43,7 @@ public class Card4_038 extends AbstractMinion { action.appendEffect( new ChooseAndPlayCardFromHandEffect(playerId, game.getGameState().getHand(playerId), -2, Filters.and(Filters.culture(Culture.DUNLAND), Filters.race(Race.MAN))) { @Override - protected void cardPlayed(PhysicalCard cardPlayed) { + protected void afterCardPlayed(PhysicalCard cardPlayed) { action.appendEffect( new AddUntilStartOfPhaseModifierEffect( new KeywordModifier(self, Filters.sameCard(cardPlayed), Keyword.FIERCE), Phase.REGROUP)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/dunland/Card6_006.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/dunland/Card6_006.java index 907fe1f3f..3e4eb2690 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/dunland/Card6_006.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/dunland/Card6_006.java @@ -43,7 +43,7 @@ public class Card6_006 extends AbstractMinion { action.appendEffect( new ChooseAndPlayCardFromHandEffect(playerId, game.getGameState().getHand(playerId), Filters.and(Filters.culture(Culture.DUNLAND), Filters.race(Race.MAN))) { @Override - protected void cardPlayed(PhysicalCard cardPlayed) { + protected void afterCardPlayed(PhysicalCard cardPlayed) { action.appendEffect( new AddUntilStartOfPhaseModifierEffect( new KeywordModifier(self, Filters.sameCard(cardPlayed), Keyword.FIERCE), Phase.REGROUP)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/sauron/Card6_105.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/sauron/Card6_105.java index feb5d5e87..063bac787 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/sauron/Card6_105.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/sauron/Card6_105.java @@ -40,7 +40,7 @@ public class Card6_105 extends AbstractPermanent { action.appendEffect( new ChooseAndPlayCardFromHandEffect(playerId, game.getGameState().getHand(playerId), -4, CardType.MINION, Filters.or(Race.NAZGUL, Culture.SAURON)) { @Override - protected void cardPlayed(PhysicalCard cardPlayed) { + protected void afterCardPlayed(PhysicalCard cardPlayed) { action.appendEffect( new ExhaustCharacterEffect(self, action, cardPlayed)); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/wraith/Card6_084.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/wraith/Card6_084.java index 0b9c0112c..44e88a326 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/wraith/Card6_084.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/wraith/Card6_084.java @@ -40,7 +40,7 @@ public class Card6_084 extends AbstractPermanent { action.appendEffect( new ChooseAndPlayCardFromHandEffect(playerId, game.getGameState().getHand(playerId), -8, CardType.MINION, Filters.or(Culture.WRAITH, Culture.SAURON)) { @Override - protected void cardPlayed(PhysicalCard cardPlayed) { + protected void afterCardPlayed(PhysicalCard cardPlayed) { action.appendEffect( new ExhaustCharacterEffect(self, action, cardPlayed)); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/sauron/Card7_274.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/sauron/Card7_274.java index 1e5c514e9..7bbfcc36a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/sauron/Card7_274.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/sauron/Card7_274.java @@ -49,7 +49,7 @@ public class Card7_274 extends AbstractMinion { action.appendEffect( new ChooseAndPlayCardFromStackedEffect(playerId, Filters.siteControlled(playerId), Culture.SAURON, Race.ORC) { @Override - protected void cardPlayed(PhysicalCard cardPlayed) { + protected void afterCardPlayed(PhysicalCard cardPlayed) { action.appendEffect( new AddUntilStartOfPhaseModifierEffect( new StrengthModifier(self, cardPlayed, 6), Phase.REGROUP));