michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged Boat customization onto develop.

Browse Source 
#bug #merge #refactor
This commit is contained in:
Calum
2017-08-17 14:21:06 +12:00
parent d0565503e8
commit d41bdfebbc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/GameClient.java
+4 -3
View File
@@ -18,7 +18,6 @@ import seng302.gameServer.GameState;
import seng302.gameServer.MainServerThread; import seng302.gameServer.MainServerThread;
import seng302.gameServer.messages.BoatAction; import seng302.gameServer.messages.BoatAction;
import seng302.gameServer.messages.BoatStatus; import seng302.gameServer.messages.BoatStatus;
import seng302.gameServer.messages.BoatAction;
import seng302.model.ClientYacht; import seng302.model.ClientYacht;
import seng302.model.RaceState; import seng302.model.RaceState;
import seng302.model.stream.packets.StreamPacket; import seng302.model.stream.packets.StreamPacket;
@@ -79,9 +78,10 @@ public class GameClient {
}); });
socketThread.addStreamObserver(this::parsePackets); socketThread.addStreamObserver(this::parsePackets);
LobbyController lobbyController = loadLobby(); LobbyController lobbyController = loadLobby();
lobbyController.setSocketThread(socketThread);
lobbyController.setPlayerID(socketThread.getClientId());
lobbyController.setPlayerListSource(clientLobbyList); lobbyController.setPlayerListSource(clientLobbyList);
lobbyController.disableReadyButton(); lobbyController.disableReadyButton();
if (regattaData != null){ if (regattaData != null){
lobbyController.setTitle(regattaData.getRegattaName()); lobbyController.setTitle(regattaData.getRegattaName());
lobbyController.setCourseName(regattaData.getCourseName()); lobbyController.setCourseName(regattaData.getCourseName());
@@ -112,8 +112,9 @@ public class GameClient {
Platform.runLater(this::loadStartScreen); Platform.runLater(this::loadStartScreen);
}); });
LobbyController lobbyController = loadLobby(); LobbyController lobbyController = loadLobby();
lobbyController.setSocketThread(socketThread);
lobbyController.setPlayerID(socketThread.getClientId());
lobbyController.setPlayerListSource(clientLobbyList); lobbyController.setPlayerListSource(clientLobbyList);
if (regattaData != null) { if (regattaData != null) {
lobbyController.setTitle("Hosting: " + regattaData.getRegattaName()); lobbyController.setTitle("Hosting: " + regattaData.getRegattaName());
lobbyController.setCourseName(regattaData.getCourseName()); lobbyController.setCourseName(regattaData.getCourseName());