Merge remote-tracking branch 'origin/Story1055_Lobby_View_Update' into Merging_GameState_With_Lobby

# Conflicts:
#	src/main/java/seng302/client/ClientPacketParser.java
#	src/main/java/seng302/client/ClientToServerThread.java
#	src/main/java/seng302/controllers/LobbyController.java
#	src/main/java/seng302/controllers/StartScreenController.java
#	src/main/java/seng302/gameServer/ServerToClientThread.java

src/main/java/seng302/client/ClientToServerThread.java

@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
+import java.net.UnknownHostException;
 import java.util.zip.CRC32;
 import java.util.zip.Checksum;
 
@@ -30,19 +31,16 @@ public class ClientToServerThread implements Runnable {
     private Boolean updateClient = true;
     private  ByteArrayOutputStream crcBuffer;
 
-    public ClientToServerThread(String ipAddress, Integer portNumber){
-        try {
-            socket = new Socket(ipAddress, portNumber);
-            is = socket.getInputStream();
-            os = socket.getOutputStream();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+    public ClientToServerThread(String ipAddress, Integer portNumber) throws Exception{
+        socket = new Socket(ipAddress, portNumber);
+        is = socket.getInputStream();
+        os = socket.getOutputStream();
 
         Integer allocatedID = threeWayHandshake();
         if (allocatedID != null) {
             ourID = allocatedID;
             clientLog("Successful handshake. Allocated ID: " + ourID, 1);
+            ClientState.setClientSourceId(String.valueOf(ourID));
         } else {
             clientLog("Unsuccessful handhsake", 1);
             closeSocket();
@@ -64,7 +62,7 @@ public class ClientToServerThread implements Runnable {
         int sync1;
         int sync2;
         // TODO: 14/07/17 wmu16 - Work out how to fix this while loop
-        while(true) {
+        while(ClientState.isConnectedToHost()) {
             try {
                 //Perform a write if it is time to as delegated by the MainServerThread
                 if (updateClient) {
@@ -99,14 +97,17 @@ public class ClientToServerThread implements Runnable {
                     } else {
                         System.err.println("Packet has been dropped");
                     }
+
                 }
+
             } catch (Exception e) {
                 closeSocket();
                 e.printStackTrace();
                 return;
             }
         }
-
+        closeSocket();
+        System.out.println("[CLIENT] Disconnected from server");
     }