diff --git a/src/main/java/de/hsfulda/onses/services/GameService.java b/src/main/java/de/hsfulda/onses/services/GameService.java index bd223d5..d57b108 100644 --- a/src/main/java/de/hsfulda/onses/services/GameService.java +++ b/src/main/java/de/hsfulda/onses/services/GameService.java @@ -31,8 +31,8 @@ public class GameService { } public void drawCard(int amount) { - Player player = null; if (!game.getDrawCardDeck().isEmpty()) { + Player player = null; if (game.getPlayerService().getCurrentTurn()) { player = game.getPlayerService().getPlayerList().getFirst(); } else { @@ -42,6 +42,13 @@ public class GameService { player.getPlayerDeck().add(game.getDrawCardDeck().getFirst()); game.getDrawCardDeck().removeFirst(); } + if (amount == 1 && !player.getPlayerDeck().isEmpty()) { //refactoring DrawnCard + Card card = player.getPlayerDeck().getLast(); + if (legalMove(card)) { + player.getPlayerService().removeCardFromPlayerDeck(card); + playCard(card);} + else nextPlayer(); + } } if (amount != 1) { nextPlayer();