The merge went well!!

Tags: #story[1109]
This commit is contained in:
Michael Rausch
2017-08-16 14:51:44 +12:00
parent 8fb5ea2223
commit 5843fc9212
4 changed files with 35 additions and 21 deletions
@@ -142,11 +142,10 @@ public class LobbyController {
@FXML
public void readyButtonPressed() {
GameState.setCurrentStage(GameStages.PRE_RACE);
return;
// Do countdown logic here
//for (LobbyCloseListener readyListener : lobbyListeners)
// readyListener.notify(CloseStatus.READY);
for (LobbyCloseListener readyListener : lobbyListeners)
readyListener.notify(CloseStatus.READY);
}
public void setTitle (String title) {