Moved sendRaceStatus Message out of S2C Thread into MS Thread (minor refactor)

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

@@ -283,7 +283,7 @@ public class GameState implements Runnable {
         Double velocity = yacht.getCurrentVelocity();
         Double trueWindAngle = Math.abs(windDirection - yacht.getHeading());
         Double boatSpeedInKnots = PolarTable.getBoatSpeed(getWindSpeedKnots(), trueWindAngle);
-        Double maxBoatSpeed = GeoUtility.knotsToMMS(boatSpeedInKnots);
+        Double maxBoatSpeed = GeoUtility.knotsToMMS(boatSpeedInKnots) * 3;
         // TODO: 15/08/17 remove magic numbers from these equations.
         if (yacht.getSailIn()) {
             if (velocity < maxBoatSpeed - 500) {

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

@@ -4,9 +4,14 @@ import java.io.IOException;
 import java.net.ServerSocket;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
+import seng302.gameServer.server.messages.BoatSubMessage;
 import seng302.gameServer.server.messages.Message;
+import seng302.gameServer.server.messages.RaceStatus;
+import seng302.gameServer.server.messages.RaceStatusMessage;
+import seng302.gameServer.server.messages.RaceType;
 import seng302.model.GeoPoint;
 import seng302.model.Player;
 import seng302.model.PolarTable;
@@ -159,14 +164,37 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
         t.schedule(new TimerTask() {
             @Override
             public void run() {
-
+                broadcastMessage(makeRaceStatusMessage());
-                for (ServerToClientThread serverToClientThread : serverToClientThreads) {
-                    serverToClientThread.sendRaceStatusMessage();
-                }
             }
         }, 0, 500);
     }
 
+    private RaceStatusMessage makeRaceStatusMessage() {
+        // variables taken from GameServerThread
+
+        List<BoatSubMessage> boatSubMessages = new ArrayList<>();
+        RaceStatus raceStatus;
+
+        for (Player player : GameState.getPlayers()) {
+            ServerYacht y = player.getYacht();
+            BoatSubMessage m = new BoatSubMessage(y.getSourceId(), y.getBoatStatus(), 0,
+                0, 0, 1234L,
+                1234L);
+            boatSubMessages.add(m);
+        }
+
+        if (GameState.getCurrentStage() == GameStages.RACING) {
+            raceStatus = RaceStatus.STARTED;
+        } else {
+            raceStatus = RaceStatus.WARNING;
+        }
+
+        return new RaceStatusMessage(1, raceStatus, GameState.getStartTime(),
+            GameState.getWindDirection(),
+            GameState.getWindSpeedMMS().longValue(), GameState.getPlayers().size(),
+            RaceType.MATCH_RACE, 1, boatSubMessages);
+    }
+
     public void terminate() {
         terminated = true;
     }

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

@@ -318,31 +318,6 @@ public class ServerToClientThread implements Runnable, Observer {
         return thread;
     }
 
-    public void sendRaceStatusMessage() {
-        // variables taken from GameServerThread
-
-        List<BoatSubMessage> boatSubMessages = new ArrayList<>();
-        RaceStatus raceStatus;
-
-        for (Player player : GameState.getPlayers()) {
-            ServerYacht y = player.getYacht();
-            BoatSubMessage m = new BoatSubMessage(y.getSourceId(), y.getBoatStatus(), 0,
-                0, 0, 1234L,
-                1234L);
-            boatSubMessages.add(m);
-        }
-
-        if (GameState.getCurrentStage() == GameStages.RACING) {
-            raceStatus = RaceStatus.STARTED;
-        } else {
-            raceStatus = RaceStatus.WARNING;
-        }
-
-        sendMessage(new RaceStatusMessage(1, raceStatus, GameState.getStartTime(), GameState.getWindDirection(),
-            GameState.getWindSpeedMMS().longValue(), GameState.getPlayers().size(),
-            RaceType.MATCH_RACE, 1, boatSubMessages));
-    }
-
     public Socket getSocket() {
         return socket;
     }

src/main/java/seng302/visualiser/GameClient.java

@@ -290,6 +290,7 @@ public class GameClient {
                 }
             }
             if (raceFinished == true) {
+                close();
                 loadFinishScreenView();
             }
 

src/main/resources/server_config/xml_templates/race.ftlh

@@ -35,14 +35,6 @@
     <CompoundMarkSequence>
         <Corner SeqID="1" CompoundMarkID="1" Rounding="PS" ZoneSize="3" />
         <Corner SeqID="2" CompoundMarkID="2" Rounding="Port" ZoneSize="3" />
-        <Corner SeqID="3" CompoundMarkID="3" Rounding="SP" ZoneSize="3" />
-        <Corner SeqID="4" CompoundMarkID="4" Rounding="PS" ZoneSize="3" />
-        <Corner SeqID="5" CompoundMarkID="3" Rounding="SP" ZoneSize="3" />
-        <Corner SeqID="6" CompoundMarkID="4" Rounding="PS" ZoneSize="3" />
-        <Corner SeqID="7" CompoundMarkID="3" Rounding="SP" ZoneSize="3" />
-        <Corner SeqID="8" CompoundMarkID="4" Rounding="PS" ZoneSize="3" />
-        <Corner SeqID="9" CompoundMarkID="3" Rounding="SP" ZoneSize="3" />
-        <Corner SeqID="10" CompoundMarkID="4" Rounding="PS" ZoneSize="3" />
         <Corner SeqID="11" CompoundMarkID="5" Rounding="PS" ZoneSize="3" />
     </CompoundMarkSequence>
     <CourseLimit>