From c8bf487c4daf98fcc2f81e794c042fbafe5d1113 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Fri, 16 Sep 2011 20:01:31 +0000 Subject: [PATCH] If one side of the skirmish is missing, no more phase actions can be played --- .../PlayersPlayPhaseActionsInOrderGameProcess.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayersPlayPhaseActionsInOrderGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayersPlayPhaseActionsInOrderGameProcess.java index af9f48068..b2e089c0c 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayersPlayPhaseActionsInOrderGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayersPlayPhaseActionsInOrderGameProcess.java @@ -2,6 +2,7 @@ package com.gempukku.lotro.logic.timing.processes.turn.general; import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.game.state.LotroGame; +import com.gempukku.lotro.game.state.Skirmish; import com.gempukku.lotro.logic.PlayOrder; import com.gempukku.lotro.logic.decisions.CardActionSelectionDecision; import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException; @@ -29,9 +30,12 @@ public class PlayersPlayPhaseActionsInOrderGameProcess implements GameProcess { @Override public void process() { - if (_game.getGameState().getCurrentPhase() == Phase.SKIRMISH - && _game.getGameState().getSkirmish().isCancelled()) { - _nextProcess = _followingGameProcess; + if (_game.getGameState().getCurrentPhase() == Phase.SKIRMISH) { + Skirmish skirmish = _game.getGameState().getSkirmish(); + // If the skirmish is cancelled or one side of the skirmish is missing, no more phase actions can be played + if (_game.getGameState().getSkirmish().isCancelled() + || skirmish.getFellowshipCharacter() == null || skirmish.getShadowCharacters().size() == 0) + _nextProcess = _followingGameProcess; } else { String playerId = _playOrder.getNextPlayer(); GatherPlayableActionsVisitor visitor = new GatherPlayableActionsVisitor(_game, playerId);