Merge branch 'develop' into story61_player_highlighting

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

@@ -101,7 +101,8 @@ public class ClientToServerThread implements Runnable {
                 }
             } catch (Exception e) {
                 closeSocket();
-                e.printStackTrace();
+                System.err.println("SERVER DISCONNECTED");
+//                e.printStackTrace();
                 return;
             }
         }

src/main/java/seng302/gameServer/GameState.java

@@ -12,7 +12,9 @@ import seng302.server.messages.BoatActionType;
  * A Static class to hold information about the current state of the game (model)
  * Created by wmu16 on 10/07/17.
  */
-public class GameState {
+public class GameState implements Runnable {
+
+    private static Integer STATE_UPDATES_PER_SECOND = 60;
 
     private static Long previousUpdateTime;
     public static Double windDirection;
@@ -31,7 +33,7 @@ public class GameState {
         players = new ArrayList<>();
 
 
-        GameState.hostIpAddress = hostIpAddress;
+        this.hostIpAddress = hostIpAddress;
         players = new ArrayList<>();
         currentStage = GameStages.LOBBYING;
         isRaceStarted = false;
@@ -39,6 +41,9 @@ public class GameState {
         //set this when game stage changes to prerace
         previousUpdateTime = System.currentTimeMillis();
         yachts = new HashMap<>();
+
+        new Thread(this).start();
+
     }
 
     public static String getHostIpAddress() {
@@ -134,7 +139,6 @@ public class GameState {
     }
 
     public static void update() {
-
         Long timeInterval = System.currentTimeMillis() - previousUpdateTime;
         previousUpdateTime = System.currentTimeMillis();
         for (Yacht yacht : yachts.values()) {
@@ -151,4 +155,28 @@ public class GameState {
         // TODO: 22/07/17 wmu16 - This may not be robust enough and may have to be improved on.
         return yachts.size() + 1;
     }
+
+
+    /**
+     * A thread to have the game state update itself at certain intervals
+     */
+    @Override
+    public void run() {
+
+        while(true) {
+            try {
+                Thread.sleep(1000 / STATE_UPDATES_PER_SECOND);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            if (currentStage == GameStages.PRE_RACE) {
+                update();
+            }
+
+            //RACING
+            if (currentStage == GameStages.RACING) {
+                update();
+            }
+        }
+    }
 }

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

@@ -17,22 +17,17 @@ import java.util.concurrent.PriorityBlockingQueue;
  * 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 = 5;
     private static final int LOG_LEVEL = 1;
 
     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);
@@ -40,8 +35,6 @@ 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<>();
-
         thread = new Thread(this);
         thread.start();
     }
@@ -57,22 +50,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()) {
             try {
-                Thread.sleep(1000 / UPDATES_PER_SECOND);
+                Thread.sleep(1000 / CLIENT_UPDATES_PER_SECOND);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
 
             if (GameState.getCurrentStage() == GameStages.PRE_RACE) {
-                GameState.update();
+                updateClients();
             }
 
             //RACING
             if (GameState.getCurrentStage() == GameStages.RACING) {
-                GameState.update();
                 updateClients();
             }
 
@@ -81,14 +72,6 @@ public class MainServerThread extends Observable implements Runnable, PacketBuff
 
             }
 
-            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
@@ -113,11 +96,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

src/main/java/seng302/models/Yacht.java

@@ -4,8 +4,6 @@ import static seng302.utilities.GeoUtility.getGeoCoordinate;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-
 import javafx.scene.paint.Color;
 import seng302.client.ClientPacketParser;
 import seng302.controllers.RaceViewController;