Merge branch 'Story62_Reading_Keystrokes' into story61_player_perspective

# Conflicts:
#	src/main/java/seng302/gameServer/ServerToClientThread.java
#	src/main/java/seng302/visualiser/ClientToServerThread.java
#	src/main/java/seng302/visualiser/controllers/RaceViewController.java

src/main/java/seng302/gameServer/MainServerThread.java

@@ -58,9 +58,10 @@ public class MainServerThread extends Thread implements PacketBufferDelegate, Cl
             }
 
 
+
             //RACING
             if (GameState.getCurrentStage() == GameStages.RACING) {
-
+                updateClients();
             }
 
 
@@ -68,9 +69,9 @@ public class MainServerThread extends Thread implements PacketBufferDelegate, Cl
             else if (GameState.getCurrentStage() == GameStages.FINISHED) {
 
             }
-
             updateClients();
 
+
             while (!packetBuffer.isEmpty()){
                 System.out.println("WHATUPPP");
                 try {
@@ -114,6 +115,13 @@ public class MainServerThread extends Thread implements PacketBufferDelegate, Cl
         return packetBuffer.add(streamPacket);
     }
 
+    private void initializeRace(){
+        for (ServerToClientThread serverToClientThread : serverToClientThreads) {
+            serverToClientThread.updateClient();
+        }
+    }
+
+
     /**
      * A client has tried to connect to the server
      * @param serverToClientThread The player that connected

src/main/java/seng302/gameServer/ServerToClientThread.java

@@ -3,6 +3,13 @@ package seng302.gameServer;
 import seng302.model.Player;
 import seng302.model.stream.StreamParser;
 import seng302.model.stream.packets.StreamPacket;
+import seng302.gameServer.GameState;
+import seng302.models.Player;
+import seng302.models.stream.PacketBufferDelegate;
+import seng302.models.stream.StreamParser;
+import seng302.models.stream.packets.StreamPacket;
+import seng302.server.messages.ChatterMessage;
+import seng302.server.messages.Heartbeat;
 import seng302.server.messages.Message;
 
 import java.io.*;
@@ -52,6 +59,9 @@ public class ServerToClientThread extends Thread {
                 //Perform a write if it is time to as delegated by the MainServerThread
                 if (updateClient) {
                     // TODO: 13/07/17 wmu16 - Write out game state - some function that would write all appropriate messages to this output stream
+                    ChatterMessage chatterMessage = new ChatterMessage(4, 14, "Hello, it's me");
+                    sendMessage(chatterMessage);
+
 //                try {
 //                    GameState.outputState(os);
 //                } catch (IOException e) {
@@ -60,9 +70,11 @@ public class ServerToClientThread extends Thread {
                     updateClient = false;
                 }
 
+
                 crcBuffer = new ByteArrayOutputStream();
                 sync1 = readByte();
                 sync2 = readByte();
+
                 //checking if it is the start of the packet
                 if(sync1 == 0x47 && sync2 == 0x83) {
                     int type = readByte();
@@ -84,6 +96,7 @@ public class ServerToClientThread extends Thread {
                     }
                 }
             } catch (Exception e) {
+                e.printStackTrace();
                 closeSocket();
                 return;
             }
@@ -160,4 +173,12 @@ public class ServerToClientThread extends Thread {
             readByte();
         }
     }
+
+    public void sendMessage(Message message){
+        try {
+            os.write(message.getBuffer());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }