Merged dev onto 1273_Skybox

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

@@ -87,7 +87,7 @@ public class GameState implements Runnable {
     private static GameStages currentStage;
     private static MarkOrder markOrder;
     private static long startTime;
-    private static List<Mark> marks;
+    private static Set<Mark> marks = new HashSet<>();
     private static List<Limit> courseLimit;
     private static Integer maxPlayers = 8;
 
@@ -112,8 +112,6 @@ public class GameState implements Runnable {
         isRaceStarted = false;
         previousUpdateTime = System.currentTimeMillis();
         newMessageListeners = new ArrayList<>();
-        marks = new MarkOrder().getAllMarks();
-        randomSpawn = new RandomSpawn(markOrder.getOrderedUniqueCompoundMarks());
 
         resetStartTime();
         //setCourseLimit("/server_config/race.xml");
@@ -125,6 +123,7 @@ public class GameState implements Runnable {
         for (CompoundMark compoundMark : raceXMLData.getCompoundMarks().values()){
             marks.addAll(compoundMark.getMarks());
         }
+        randomSpawn = new RandomSpawn(markOrder.getOrderedUniqueCompoundMarks());
         courseLimit = raceXMLData.getCourseLimit();
     }
 

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

@@ -82,8 +82,6 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
         startAdvertisingServer();
         PolarTable.parsePolarFile(getClass().getResourceAsStream("/server_config/acc_polars.csv"));
         GameState.addMessageEventListener(this::broadcastMessage);
-        startUpdatingWind();
-        startSpawningTokens();
         sendSetupMessages();
     }
 

src/main/java/seng302/gameServer/MessageFactory.java

@@ -22,6 +22,7 @@ import seng302.model.stream.xml.generator.RegattaXMLTemplate;
 import seng302.model.stream.xml.parser.RaceXMLData;
 import seng302.model.stream.xml.parser.RegattaXMLData;
 import seng302.model.token.Token;
+import seng302.model.token.TokenType;
 import seng302.utilities.XMLGenerator;
 
 import java.util.ArrayList;