ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing the playing first site.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-11-21 21:37:39 +00:00
parent e4f326132f
commit 2dd777bf80
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
View File

@@ -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))