diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/SelectPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/SelectPieceState.java index 3a61365f..0ccbe5f7 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/SelectPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/SelectPieceState.java @@ -2,6 +2,7 @@ import pp.mdga.game.*; import pp.mdga.game.card.HiddenCard; +import pp.mdga.game.card.PowerCard; import pp.mdga.message.client.RequestMoveMessage; import pp.mdga.message.server.DrawCardMessage; import pp.mdga.message.server.MoveMessage; @@ -169,7 +170,9 @@ public void received(RequestMoveMessage msg, int from){ if(targetNode.isBonus()) { for (Player p : logic.getGame().getPlayersAsList()) { if(p.getColor() == logic.getGame().getActiveColor()) { - logic.getServerSender().send(logic.getGame().getPlayerIdByColor(p.getColor()), new DrawCardMessage(logic.getGame().draw())); + PowerCard cardToDraw = logic.getGame().draw(); + p.addHandCard(cardToDraw); + logic.getServerSender().send(logic.getGame().getPlayerIdByColor(p.getColor()), new DrawCardMessage(cardToDraw)); } else { logic.getServerSender().send(logic.getGame().getPlayerIdByColor(p.getColor()), new DrawCardMessage(new HiddenCard())); } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/StartPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/StartPieceState.java index 700b627e..2be3d081 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/StartPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/StartPieceState.java @@ -4,6 +4,7 @@ import pp.mdga.game.Piece; import pp.mdga.game.Player; import pp.mdga.game.card.HiddenCard; +import pp.mdga.game.card.PowerCard; import pp.mdga.message.client.RequestMoveMessage; import pp.mdga.message.server.DrawCardMessage; import pp.mdga.message.server.MoveMessage; @@ -63,7 +64,9 @@ public void received(RequestMoveMessage msg, int from){ if(targetNode.isBonus()) { for (Player p : logic.getGame().getPlayersAsList()) { if(p.getColor() == logic.getGame().getActiveColor()) { - logic.getServerSender().send(logic.getGame().getPlayerIdByColor(p.getColor()), new DrawCardMessage(logic.getGame().draw())); + PowerCard cardToDraw = logic.getGame().draw(); + p.addHandCard(cardToDraw); + logic.getServerSender().send(logic.getGame().getPlayerIdByColor(p.getColor()), new DrawCardMessage(cardToDraw)); } else { logic.getServerSender().send(logic.getGame().getPlayerIdByColor(p.getColor()), new DrawCardMessage(new HiddenCard())); }