From d41bdfebbcdd3ed5d1815d45422be1dc76b59a32 Mon Sep 17 00:00:00 2001
From: Calum <cir27@uclive.ac.nz>
Date: Thu, 17 Aug 2017 14:21:06 +1200
Subject: [PATCH] Merged Boat customization onto develop.

#bug #merge #refactor
---
 src/main/java/seng302/visualiser/GameClient.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/seng302/visualiser/GameClient.java b/src/main/java/seng302/visualiser/GameClient.java
index f3240f4f..eabe0b8d 100644
--- a/src/main/java/seng302/visualiser/GameClient.java
+++ b/src/main/java/seng302/visualiser/GameClient.java
@@ -18,7 +18,6 @@ import seng302.gameServer.GameState;
 import seng302.gameServer.MainServerThread;
 import seng302.gameServer.messages.BoatAction;
 import seng302.gameServer.messages.BoatStatus;
-import seng302.gameServer.messages.BoatAction;
 import seng302.model.ClientYacht;
 import seng302.model.RaceState;
 import seng302.model.stream.packets.StreamPacket;
@@ -79,9 +78,10 @@ public class GameClient {
             });
             socketThread.addStreamObserver(this::parsePackets);
             LobbyController lobbyController = loadLobby();
+            lobbyController.setSocketThread(socketThread);
+            lobbyController.setPlayerID(socketThread.getClientId());
             lobbyController.setPlayerListSource(clientLobbyList);
             lobbyController.disableReadyButton();
-
             if (regattaData != null){
                 lobbyController.setTitle(regattaData.getRegattaName());
                 lobbyController.setCourseName(regattaData.getCourseName());
@@ -112,8 +112,9 @@ public class GameClient {
                 Platform.runLater(this::loadStartScreen);
             });
             LobbyController lobbyController = loadLobby();
+            lobbyController.setSocketThread(socketThread);
+            lobbyController.setPlayerID(socketThread.getClientId());
             lobbyController.setPlayerListSource(clientLobbyList);
-
             if (regattaData != null) {
                 lobbyController.setTitle("Hosting: " + regattaData.getRegattaName());
                 lobbyController.setCourseName(regattaData.getCourseName());