|
|
@ -36,6 +36,9 @@ public class GameService { |
|
|
|
player.getPlayerDeck().add(game.getDrawCardDeck().getFirst()); |
|
|
|
game.getDrawCardDeck().removeFirst(); |
|
|
|
} |
|
|
|
if (amount != 1) { |
|
|
|
nextPlayer(); |
|
|
|
} |
|
|
|
} |
|
|
|
public void playCard(Player player, Card card) |
|
|
|
{ |
|
|
@ -63,7 +66,6 @@ public class GameService { |
|
|
|
if (card.getValue() == Card.Value.DRAWTWO) { |
|
|
|
nextPlayer(); |
|
|
|
drawCard(2); |
|
|
|
nextPlayer(); |
|
|
|
} |
|
|
|
// ChooseDraw |
|
|
|
if (card.getValue() == Card.Value.CHOOSEDRAW) { |
|
|
@ -72,7 +74,6 @@ public class GameService { |
|
|
|
game.changeLastPlayedCardColor(color); |
|
|
|
nextPlayer(); |
|
|
|
drawCard(4); |
|
|
|
nextPlayer(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|