Skip to content
Snippets Groups Projects
Commit 992812a5 authored by Administrator's avatar Administrator
Browse files

Fixed #1

parent 87b469fc
No related branches found
No related tags found
No related merge requests found
No preview for this file type
No preview for this file type
...@@ -137,7 +137,7 @@ public class Controller ...@@ -137,7 +137,7 @@ public class Controller
drawCounter = 0; drawCounter = 0;
// DEBUG // DEBUG
game = new Game(this, 3); game = new Game(this, 2);
setLabelNames(game.getPlayer(), game.getAIs()); setLabelNames(game.getPlayer(), game.getAIs());
game.newGame(5); game.newGame(5);
......
...@@ -142,12 +142,6 @@ public class Game ...@@ -142,12 +142,6 @@ public class Game
System.out.println("ROUND: " + counter / 4 + 1); System.out.println("ROUND: " + counter / 4 + 1);
determineNextPlayer();
System.out.println("Player " + currentPlayer + "'s turn");
if(skipped || !lastCard.getType().equals(CardType.SKIP))
{
if(lastCard.getType().equals(CardType.REVERSE) && !lastPlayerDraw) if(lastCard.getType().equals(CardType.REVERSE) && !lastPlayerDraw)
{ {
if(direction.equals(Direction.RIGHT)) if(direction.equals(Direction.RIGHT))
...@@ -163,6 +157,12 @@ public class Game ...@@ -163,6 +157,12 @@ public class Game
} }
} }
determineNextPlayer();
System.out.println("Player " + currentPlayer + "'s turn");
if(skipped || !lastCard.getType().equals(CardType.SKIP))
{
if(currentPlayer == 1) if(currentPlayer == 1)
{ {
controller.setLabelCurrentPlayer(player.getName() + " ist am Zug"); controller.setLabelCurrentPlayer(player.getName() + " ist am Zug");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment