external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

*Fixed NPE when spectating AIvAI into game 2+

Browse Source
This commit is contained in:
Hellfish
2013-05-21 20:51:40 +00:00
parent 8ac75ba23c
commit 30454f3cab
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/forge/game/MatchController.java
View File

@@ -357,13 +357,18 @@ public class MatchController {
*/ */
private Player determineFirstTurnPlayer(final GameOutcome lastGameOutcome, final GameState game) { private Player determineFirstTurnPlayer(final GameOutcome lastGameOutcome, final GameState game) {
// Only cut/coin toss if it's the first game of the match // Only cut/coin toss if it's the first game of the match
Player goesFirst; Player goesFirst = null;
Player humanPlayer = Singletons.getControl().getPlayer(); Player humanPlayer = Singletons.getControl().getPlayer();
boolean isFirstGame = lastGameOutcome == null; boolean isFirstGame = lastGameOutcome == null;
if (isFirstGame) { if (isFirstGame) {
goesFirst = seeWhoPlaysFirstDice(game); goesFirst = seeWhoPlaysFirstDice(game);
} else { } else {
goesFirst = lastGameOutcome.isWinner(humanPlayer.getLobbyPlayer()) ? humanPlayer.getOpponent() : humanPlayer; for(Player p : game.getPlayers()) {
if(lastGameOutcome.isWinner(p.getLobbyPlayer())) {
goesFirst = p.getOpponent();
break;
}
}
} }
String message = goesFirst + ( isFirstGame ? " has won the coin toss." : " lost the last game."); String message = goesFirst + ( isFirstGame ? " has won the coin toss." : " lost the last game.");
boolean willPlay = goesFirst.getController().getWillPlayOnFirstTurn(message); boolean willPlay = goesFirst.getController().getWillPlayOnFirstTurn(message);