Fixed merge bug, and an unrelated null pointer exception.

2017-09-13 14:52:21 +12:00
parent 6761778dd4
commit b655b3e233
2 changed files with 2 additions and 2 deletions
@@ -121,6 +121,7 @@ public class MockRace extends RaceState {
        //Construct a MockBoat using the Boat and Polars.
        MockBoat mockBoat = new MockBoat(boat, polars);
        mockBoat.setCurrentLeg(this.getLegs().get(0));
+        mockBoat.setEstimatedTimeAtNextMark(this.getRaceClock().getCurrentTime());

        //Update participant list.
        getRaceDataSource().getParticipants().add(sourceID);