Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules

2017-05-04 12:50:42 +12:00
parent c3ee3ec9e2 34ef1172ce
commit 5ebd4251e2
7 changed files with 82 additions and 15 deletions
@@ -131,6 +131,7 @@ public class Race implements Runnable {
                boatOffset = (boatOffset + 1) % (startingBoats.size());

                if (timeLeft <= 60000/scaleFactor && timeLeft > 0) {
+                    System.out.println("Race status 2");
                    RaceStatus raceStatus = new RaceStatus(System.currentTimeMillis(), raceId, 2, 2, boatStatusMessages);
                    mockOutput.parseRaceStatus(raceStatus);
                }
@@ -142,6 +143,7 @@ public class Race implements Runnable {
                    stop();
                }
                else {
+                    System.out.println("Race status 1");
                    RaceStatus raceStatus = new RaceStatus(System.currentTimeMillis(), raceId, 1, 2, boatStatusMessages);
                    mockOutput.parseRaceStatus(raceStatus);
                }