diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayerPlaysStartingFellowshipGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayerPlaysStartingFellowshipGameProcess.java index 26a2da24b..4ba24c909 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayerPlaysStartingFellowshipGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayerPlaysStartingFellowshipGameProcess.java @@ -31,9 +31,10 @@ public class PlayerPlaysStartingFellowshipGameProcess implements GameProcess { @Override public void process(LotroGame game) { Collection possibleCharacters = getPossibleCharacters(game, _playerId); - if (possibleCharacters.size() == 0) + if (possibleCharacters.size() == 0) { + game.getGameState().stopAffectingCardsForCurrentPlayer(); _nextProcess = _followingGameProcess; - else + } else game.getUserFeedback().sendAwaitingDecision(_playerId, createChooseNextCharacterDecision(game, _playerId, possibleCharacters)); } @@ -57,9 +58,10 @@ public class PlayerPlaysStartingFellowshipGameProcess implements GameProcess { @Override public void decisionMade(String result) throws DecisionResultInvalidException { List selectedCharacters = getSelectedCardsByResponse(result); - if (selectedCharacters.size() == 0) + if (selectedCharacters.size() == 0) { + game.getGameState().stopAffectingCardsForCurrentPlayer(); _nextProcess = _followingGameProcess; - else { + } else { PhysicalCard selectedPhysicalCard = selectedCharacters.get(0); Action playCardAction = selectedPhysicalCard.getBlueprint().getPlayCardAction(playerId, game, selectedPhysicalCard, 0, false); game.getActionsEnvironment().addActionToStack(playCardAction); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/BetweenTurnsProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/BetweenTurnsProcess.java index 152e66623..9e310bf46 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/BetweenTurnsProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/BetweenTurnsProcess.java @@ -1,6 +1,5 @@ package com.gempukku.lotro.logic.timing.processes.turn; -import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.PlayOrder; import com.gempukku.lotro.logic.timing.processes.GameProcess; @@ -8,9 +7,6 @@ import com.gempukku.lotro.logic.timing.processes.GameProcess; public class BetweenTurnsProcess implements GameProcess { @Override public void process(LotroGame game) { - game.getGameState().stopAffectingCardsForCurrentPlayer(); - game.getGameState().setCurrentPhase(Phase.BETWEEN_TURNS); - PlayOrder playOrder = game.getGameState().getPlayerOrder().getClockwisePlayOrder(game.getGameState().getCurrentPlayerId(), false); playOrder.getNextPlayer(); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java index 41c048d19..4bc434465 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java @@ -1,5 +1,6 @@ package com.gempukku.lotro.logic.timing.processes.turn; +import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.game.state.actions.DefaultActionsEnvironment; import com.gempukku.lotro.logic.actions.SystemQueueAction; @@ -36,6 +37,8 @@ public class EndOfTurnGameProcess implements GameProcess { public void playEffect(LotroGame game) { ((ModifiersLogic) game.getModifiersEnvironment()).removeEndOfTurn(); ((DefaultActionsEnvironment) game.getActionsEnvironment()).removeEndOfTurnActionProxies(); + game.getGameState().stopAffectingCardsForCurrentPlayer(); + game.getGameState().setCurrentPhase(Phase.BETWEEN_TURNS); } }); game.getActionsEnvironment().addActionToStack(action);