diff --git a/src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java b/src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java index 4d04688..d51891c 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java +++ b/src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java @@ -89,7 +89,10 @@ public class ClientController { * @param pos the index of the card to draw */ public void drawLowerTribeCard(String playerUsername,int pos) { - client.doEvent(new DrawLowerTribeCard(playerUsername,pos)); + if(!Objects.equals(playerUsername, localController.getModel().getCurrentState().getCurrentPlayer().getUserName())) + view.showError("It's not your turn!"); + else + client.doEvent(new DrawLowerTribeCard(playerUsername,pos)); } @@ -140,8 +143,9 @@ public class ClientController { * This action is available only when the lower list is empty or the player cannot draw any card. * @param playerUsername the name of the player performing the action */ - public void skipLower(String playerUsername) { if(!Objects.equals(playerUsername, localController.getModel().getCurrentState().getCurrentPlayer().getUserName())) - view.showError("It's not your turn!"); + public void skipLower(String playerUsername) { + if(!Objects.equals(playerUsername, localController.getModel().getCurrentState().getCurrentPlayer().getUserName())) + view.showError("It's not your turn!"); else client.doEvent(new SkipLower(playerUsername));}