Merge branch 'develop' into story61_player_perspective

# Conflicts:
#	src/main/java/seng302/App.java
#	src/main/java/seng302/client/ClientPacketParser.java
#	src/main/java/seng302/client/ClientState.java
#	src/main/java/seng302/client/ClientStateQueryingRunnable.java
#	src/main/java/seng302/controllers/Controller.java
#	src/main/java/seng302/controllers/LobbyController.java
#	src/main/java/seng302/controllers/RaceViewController.java
#	src/main/java/seng302/controllers/StartScreenController.java
#	src/main/java/seng302/fxObjects/BoatAnnotations.java
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/gameServer/MainServerThread.java
#	src/main/java/seng302/model/Yacht.java
#	src/main/java/seng302/model/stream/StreamReceiver.java
#	src/main/java/seng302/visualiser/ClientToServerThread.java
#	src/main/java/seng302/visualiser/GameView.java
#	src/main/java/seng302/visualiser/fxObjects/BoatObject.java
#	src/test/java/seng302/model/stream/StreamReceiverTest.java

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

@@ -2,35 +2,36 @@ package seng302.gameServer;
 
 import java.time.LocalDateTime;
 import java.util.Observable;
+import seng302.client.ClientPacketParser;
+import seng302.models.Player;
+import seng302.models.stream.PacketBufferDelegate;
+import seng302.models.stream.packets.StreamPacket;
+
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.ArrayList;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.PriorityBlockingQueue;
-import seng302.model.Player;
-import seng302.model.stream.PacketBufferDelegate;
-import seng302.model.stream.packets.StreamPacket;
+import java.util.logging.Logger;
 
 /**
  * A class describing the overall server, which creates and collects server threads for each client
  * Created by wmu16 on 13/07/17.
  */
-public class MainServerThread extends Observable implements Runnable, PacketBufferDelegate, ClientConnectionDelegate{
+public class MainServerThread extends Observable implements Runnable, ClientConnectionDelegate{
 
     private static final int PORT = 4942;
-    private static final Integer MAX_NUM_PLAYERS = 3;
-    private static final Integer UPDATES_PER_SECOND = 2;
+    private static final Integer CLIENT_UPDATES_PER_SECOND = 10;
     private static final int LOG_LEVEL = 1;
+    private boolean terminated;
 
     private Thread thread;
 
     private ServerSocket serverSocket = null;
-    private Socket socket;
     private ArrayList<ServerToClientThread> serverToClientThreads = new ArrayList<>();
 
-    private PriorityBlockingQueue<StreamPacket> packetBuffer;
-
-
     public MainServerThread() {
         try {
             serverSocket = new ServerSocket(PORT);
@@ -38,8 +39,7 @@ public class MainServerThread extends Observable implements Runnable, PacketBuff
             serverLog("IO error in server thread handler upon trying to make new server socket", 0);
         }
 
-        packetBuffer = new PriorityBlockingQueue<>();
-
+        terminated = false;
         thread = new Thread(this);
         thread.start();
     }
@@ -55,22 +55,20 @@ public class MainServerThread extends Observable implements Runnable, PacketBuff
         heartbeatThread.start();
         serverListenThread.start();
 
-
         //You should handle interrupts in some way, so that the thread won't keep on forever if you exit the app.
-        while (!thread.isInterrupted()) {
+        while (!terminated) {
             try {
-                Thread.sleep(1000 / UPDATES_PER_SECOND);
+                Thread.sleep(1000 / CLIENT_UPDATES_PER_SECOND);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                serverLog("Interrupted exception in Main Server Thread thread sleep", 1);
             }
 
             if (GameState.getCurrentStage() == GameStages.PRE_RACE) {
-                GameState.update();
+                updateClients();
             }
 
             //RACING
             if (GameState.getCurrentStage() == GameStages.RACING) {
-                GameState.update();
                 updateClients();
             }
 
@@ -78,15 +76,6 @@ public class MainServerThread extends Observable implements Runnable, PacketBuff
             else if (GameState.getCurrentStage() == GameStages.FINISHED) {
 
             }
-
-            while (!packetBuffer.isEmpty()){
-                try {
-                    StreamPacket packet = packetBuffer.take();
-//                    ClientPacketParser.parsePacket(packet);
-                } catch (InterruptedException e) {
-                    continue;
-                }
-            }
         }
 
         // TODO: 14/07/17 wmu16 - Send out disconnect packet to clients
@@ -111,11 +100,6 @@ public class MainServerThread extends Observable implements Runnable, PacketBuff
         }
     }
 
-    @Override
-    public boolean addToBuffer(StreamPacket streamPacket) {
-        return packetBuffer.add(streamPacket);
-    }
-
     /**
      * A client has tried to connect to the server
      * @param serverToClientThread The player that connected
@@ -153,20 +137,20 @@ public class MainServerThread extends Observable implements Runnable, PacketBuff
     }
 
     public void startGame() {
-        for (ServerToClientThread serverToClientThread : serverToClientThreads) {
-            serverToClientThread.sendRaceStatusMessage();
-        }
+        Timer t = new Timer();
+
+        t.schedule(new TimerTask() {
+            @Override
+            public void run() {
+
+                for (ServerToClientThread serverToClientThread : serverToClientThreads) {
+                    serverToClientThread.sendRaceStatusMessage();
+                }
+            }
+        }, 0, 500);
     }
 
-    public void shutDown() {
-        for (ServerToClientThread serverToClientThread : serverToClientThreads) {
-            try {
-                serverToClientThread.getSocket().close();
-            } catch (IOException ioe) {
-                serverLog("Failed to close socket " + serverToClientThread.getSocket().toString(), 0);
-            }
-        }
-        serverToClientThreads = null;
-        thread = null;
+    public void terminate() {
+        terminated = true;
     }
 }