Merge branch 'RaceFactory' into CommandFactory

racevisionGame/src/main/java/shared/model/Constants.java

@@ -38,7 +38,7 @@ public class Constants {
     /**
      * The race pre-start time, in milliseconds. 3 minutes.
      */
-    public static final long RacePreStartTime = 3 * 60 * 1000;
+    public static final long RacePreStartTime = 1 * 10 * 1000;
 
 
     /**

racevisionGame/src/main/java/shared/model/Race.java

@@ -43,18 +43,6 @@ public abstract class Race implements Runnable {
      */
     protected LatestMessages latestMessages;
 
-    /**
-     * The sequence number of the latest BoatLocation message sent or received.
-     */
-    protected int boatLocationSequenceNumber = 1;
-
-    /**
-     * The sequence number of the latest RaceStatus message sent or received.
-     */
-    protected int raceStatusSequenceNumber = 1;
-
-
-
     /**
      * A list of compound marks in the race.
      */
@@ -364,4 +352,8 @@ public abstract class Race implements Runnable {
             this.lastFpsResetTime = 0;
         }
     }
+
+    public int getRaceId() {
+        return raceId;
+    }
 }