Fixed: disconnection during lobby creation
This commit is contained in:
@@ -96,20 +96,25 @@ public class Game implements Serializable {
|
||||
return false;
|
||||
}
|
||||
disconnetedPlayers.put(player,true);
|
||||
if(currentState.getCurrentPlayer().equals(player))
|
||||
if(!currentState.getGameStage().equals(GameStages.TOTEM_CHOICE))
|
||||
if (currentState.equals(GameStages.WAITING)) {
|
||||
playersList.remove(player);
|
||||
return true;
|
||||
}
|
||||
if(currentState.getCurrentPlayer().equals(player)) {
|
||||
if (!currentState.getGameStage().equals(GameStages.TOTEM_CHOICE)) {
|
||||
nextPlayerSetup();
|
||||
else
|
||||
{
|
||||
if(totemChoiceQueue.isEmpty())
|
||||
{
|
||||
player.totem=getAvailableTotems().get(new Random().nextInt(getAvailableTotems().size()-1));
|
||||
}
|
||||
else {
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
if (totemChoiceQueue.isEmpty()) {
|
||||
player.totem = getAvailableTotems().get(new Random().nextInt(getAvailableTotems().size() - 1));
|
||||
} else {
|
||||
totemChoiceQueue.add(player);
|
||||
}
|
||||
currentState.PlayerUpdate(totemChoiceQueue.poll(),null);
|
||||
currentState.PlayerUpdate(totemChoiceQueue.poll(), null);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user