From 2dd777bf80207a28a95f39e56c6e275af38e83a3 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 21 Nov 2011 21:37:39 +0000 Subject: [PATCH] Fixing the playing first site. --- .../java/com/gempukku/lotro/game/state/GameState.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java index 8d893a8d2..0942ce09e 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java @@ -460,7 +460,7 @@ public class GameState { public boolean iterateActiveTextCards(PhysicalCardVisitor physicalCardVisitor) { for (PhysicalCardImpl physicalCard : _inPlay) { - if (physicalCard.getBlueprint().getCardType() != CardType.SITE || getCurrentSite() == physicalCard) + if (physicalCard.getBlueprint().getCardType() != CardType.SITE || (_currentPhase != Phase.PUT_RING_BEARER && _currentPhase != Phase.PLAY_STARTING_FELLOWSHIP && getCurrentSite() == physicalCard)) if (isCardInPlayActive(physicalCard)) if (physicalCardVisitor.visitPhysicalCard(physicalCard)) return true; @@ -470,7 +470,8 @@ public class GameState { } public boolean iterateActiveTextCards(String player, PhysicalCardVisitor physicalCardVisitor) { - physicalCardVisitor.visitPhysicalCard(getCurrentSite()); + if (_currentPhase != Phase.PUT_RING_BEARER && _currentPhase != Phase.PLAY_STARTING_FELLOWSHIP) + physicalCardVisitor.visitPhysicalCard(getCurrentSite()); for (PhysicalCardImpl physicalCard : _inPlay) { if (physicalCard.getBlueprint().getCardType() != CardType.SITE && physicalCard.getOwner().equals(player) && isCardInPlayActive(physicalCard)) @@ -481,8 +482,9 @@ public class GameState { } public boolean iterateActivableCards(String player, PhysicalCardVisitor physicalCardVisitor) { - if (physicalCardVisitor.visitPhysicalCard(getCurrentSite())) - return true; + if (_currentPhase != Phase.PUT_RING_BEARER && _currentPhase != Phase.PLAY_STARTING_FELLOWSHIP) + if (physicalCardVisitor.visitPhysicalCard(getCurrentSite())) + return true; for (PhysicalCardImpl physicalCard : _inPlay) { if (physicalCard.getOwner().equals(player) && physicalCard.getBlueprint().getCardType() != CardType.SITE && isCardInPlayActive(physicalCard))