- Cleanup and NPE protection.

This commit is contained in:
Sloth
2015-02-08 13:36:17 +00:00
parent 2c2139e3d6
commit b5dd19867a
3 changed files with 20 additions and 25 deletions

View File

@@ -1407,19 +1407,17 @@ public class GameAction {
}
// Power Play - Each player with a Power Play in the CommandZone becomes the Starting Player
CardCollectionView commandCards = game.getCardsIn(ZoneType.Command);
if (commandCards.size() > 0) {
CardCollection powerPlays = CardLists.getValidCards(commandCards, "Card.namedPower Play", game.getPlayers().getFirst(), commandCards.getFirst());
Set<Player> powerPlayers = new HashSet<>();
for (Card c : powerPlays) {
powerPlayers.add(c.getOwner());
}
Set<Player> powerPlayers = new HashSet<>();
for (Card c : game.getCardsIn(ZoneType.Command)) {
if (c.getName().equals("Power Play")) {
powerPlayers.add(c.getOwner());
}
}
if (powerPlayers.size() > 0) {
ArrayList<Player> players = Lists.newArrayList(powerPlayers);
Collections.shuffle(players);
return players.get(0);
}
if (!powerPlayers.isEmpty()) {
ArrayList<Player> players = Lists.newArrayList(powerPlayers);
Collections.shuffle(players);
return players.get(0);
}
boolean isFirstGame = lastGameOutcome == null;