Fixed failing tests & other bug fixes

- Fixed server capacity in server list
- Fixed failing unit tests for chat

Tags: #story[1281] #pair[mra106, cir27]

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

@@ -1,5 +1,6 @@
 package seng302.gameServer;
 
+import java.io.IOException;
 import java.util.*;
 
 import javafx.scene.paint.Color;
@@ -81,7 +82,7 @@ public class GameState implements Runnable {
     private static MarkOrder markOrder;
     private static long startTime;
     private static Set<Mark> marks = new HashSet<>();
-    private static List<Limit> courseLimit;
+    private static List<Limit> courseLimit = new ArrayList<>();
     private static Integer maxPlayers = 8;
 
     private static List<Token> tokensInPlay;
@@ -97,7 +98,6 @@ public class GameState implements Runnable {
         windSpeed = 10000d;
         yachts = new HashMap<>();
         tokensInPlay = new ArrayList<>();
-        marks = new HashSet<>();
         players = new ArrayList<>();
         customizationFlag = false;
         playerHasLeftFlag = false;
@@ -517,6 +517,7 @@ public class GameState implements Runnable {
                 return true;
             }
         }
+
         if (GeoUtility.checkCrossedLine(courseLimit.get(courseLimit.size() - 1), courseLimit.get(0),
             yacht.getLastLocation(), yacht.getLocation()) != 0) {
             return true;
@@ -1025,6 +1026,12 @@ public class GameState implements Runnable {
 
     public static void setMaxPlayers(Integer newMax){
         maxPlayers = newMax;
+
+        try {
+            ServerAdvertiser.getInstance().setCapacity(newMax);
+        } catch (IOException e) {
+            logger.warn("Couldn't update max players");
+        }
     }
 
     public static void endRace () {

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

@@ -63,7 +63,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
             ServerAdvertiser.getInstance()
                 .setMapName(regattaXMLData.getCourseName())
                 .setCapacity(capacity)
-                .setNumberOfPlayers(numPlayers)
+                .setNumberOfPlayers(numPlayers - 1)
                 .registerGame(PORT, regattaXMLData.getRegattaName());
         } catch (IOException e) {
             logger.warn("Could not register server");
@@ -84,11 +84,11 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
     }
 
     private void startServer() {
+        PolarTable.parsePolarFile(getClass().getResourceAsStream("/server_config/acc_polars.csv"));
         MessageFactory.updateXMLGenerator(raceXMLData, regattaXMLData);
         GameState.setRace(raceXMLData);
         MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
         startAdvertisingServer();
-        PolarTable.parsePolarFile(getClass().getResourceAsStream("/server_config/acc_polars.csv"));
         GameState.addMessageEventListener(this::broadcastMessage);
         sendSetupMessages();
     }

src/main/java/seng302/gameServer/ServerDescription.java

@@ -92,13 +92,10 @@ public class ServerDescription {
 
     public Boolean serverShouldBeRemoved() {
         if (lastRefreshed == null) return false;
-
-        System.out.println("SBR" + (System.currentTimeMillis() - lastRefreshed > EXPIRY_INTERVAL));
         return System.currentTimeMillis() - lastRefreshed > EXPIRY_INTERVAL;
     }
 
     public void hasBeenRefreshed(){
-        System.out.println("Was refreshed");
         lastRefreshed = System.currentTimeMillis();
     }
 }