Merge branch 'nullptr_finish_race_arrow' into newHostServer

racevisionGame/src/main/java/shared/dataInput/EmptyBoatDataSource.java

@@ -22,7 +22,7 @@ public class EmptyBoatDataSource implements BoatDataSource {
     private final Map<Integer, Mark> markerMap = new HashMap<>();
 
 
-    private int sequenceNumber = 0;
+    private int sequenceNumber = -1;
 
 
     public EmptyBoatDataSource() {

racevisionGame/src/main/java/shared/dataInput/EmptyRaceDataSource.java

@@ -84,7 +84,7 @@ public class EmptyRaceDataSource implements RaceDataSource {
     private RaceTypeEnum raceType = RaceTypeEnum.NOT_A_RACE_TYPE;
 
 
-    private int sequenceNumber = 0;
+    private int sequenceNumber = -1;
 
 
     public EmptyRaceDataSource() {

racevisionGame/src/main/java/shared/dataInput/EmptyRegattaDataSource.java

@@ -60,7 +60,7 @@ public class EmptyRegattaDataSource implements RegattaDataSource {
 
 
 
-    private int sequenceNumber = 0;
+    private int sequenceNumber = -1;
 
 
     public EmptyRegattaDataSource() {

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

@@ -148,26 +148,32 @@ public abstract class RaceState extends Observable{
      * @param raceDataSource New race data source.
      */
     public void setRaceDataSource(RaceDataSource raceDataSource) {
+        if ((this.raceDataSource == null) || (raceDataSource.getSequenceNumber() > this.raceDataSource.getSequenceNumber())) {
             this.raceDataSource = raceDataSource;
             this.getRaceClock().setStartingTime(raceDataSource.getStartDateTime());
             useLegsList(raceDataSource.getLegs());
         }
+    }
 
     /**
      * Sets the boat data source for the race.
      * @param boatDataSource New boat data source.
      */
     public void setBoatDataSource(BoatDataSource boatDataSource) {
+        if ((this.boatDataSource == null) || (boatDataSource.getSequenceNumber() > this.boatDataSource.getSequenceNumber())) {
             this.boatDataSource = boatDataSource;
         }
+    }
 
     /**
      * Sets the regatta data source for the race.
      * @param regattaDataSource New regatta data source.
      */
     public void setRegattaDataSource(RegattaDataSource regattaDataSource) {
+        if ((this.regattaDataSource == null) || (regattaDataSource.getSequenceNumber() > this.regattaDataSource.getSequenceNumber())) {
             this.regattaDataSource = regattaDataSource;
         }
+    }
 
 
     /**

racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java

@@ -15,11 +15,13 @@ import javafx.scene.control.Label;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
+import javafx.scene.paint.Color;
 import javafx.scene.paint.PhongMaterial;
 import javafx.scene.shape.MeshView;
 import mock.app.Event;
 import network.Messages.Enums.RaceStatusEnum;
 import network.Messages.Enums.RequestToJoinEnum;
+import shared.model.Boat;
 import visualiser.app.App;
 import visualiser.gameController.ControllerClient;
 import visualiser.layout.SeaSurface;
@@ -125,14 +127,22 @@ public class InGameLobbyController extends Controller {
 
         @Override
         public void onChanged(Change change) {
-            Platform.runLater(
-                    () -> {
+            Platform.runLater(() -> {
                 while (change.next()) {
                     if (change.wasAdded() || change.wasRemoved() || change.wasUpdated()) {
+                        populateLobby();
+                    }
+                }
+            });
+        }
+
+        public void populateLobby() {
+
             try{
                 resetLobby();
                 int count = 0;
                 int row = 0;
+
                 for (VisualiserBoat boat :visualiserRaceEvent.getVisualiserRaceState().getBoats()) {
                     View3D playerBoatToSet = new View3D();
                     playerBoatToSet.setItems(subjects);
@@ -174,12 +184,10 @@ public class InGameLobbyController extends Controller {
                 }
             }
             catch(ConcurrentModificationException e){
+                e.printStackTrace();
             }
         }
-                        }
-                    }
-            );
-        }
+
     }
     /*
     private void populatePlayers(ListChangeListener.Change change){
@@ -192,7 +200,6 @@ public class InGameLobbyController extends Controller {
          //Initialises the race clock.
         initialiseRaceClock(this.visualiserRaceEvent.getVisualiserRaceState());
 
-
         //Starts the race countdown timer.
         countdownTimer();
     }
@@ -228,7 +235,6 @@ public class InGameLobbyController extends Controller {
         new AnimationTimer() {
             @Override
             public void handle(long arg0) {
-
                 //Get the current race status.
                 RaceStatusEnum raceStatus = visualiserRaceEvent.getVisualiserRaceState().getRaceStatusEnum();
                 

racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java

@@ -94,7 +94,7 @@ public class VisualiserRaceState extends RaceState {
         super.setRaceDataSource(raceDataSource);
 
         if (getBoatDataSource() != null) {
-            this.generateVisualiserBoats(this.boats, getBoatDataSource().getBoats(), raceDataSource.getParticipants(), unassignedColors);
+            this.generateVisualiserBoats(this.boats, getBoatDataSource().getBoats(), getRaceDataSource().getParticipants(), unassignedColors);
         }
 
         initialiseLegCompletionOrder();
@@ -109,7 +109,7 @@ public class VisualiserRaceState extends RaceState {
         super.setBoatDataSource(boatDataSource);
 
         if (getRaceDataSource() != null) {
-            this.generateVisualiserBoats(this.boats, boatDataSource.getBoats(), getRaceDataSource().getParticipants(), unassignedColors);
+            this.generateVisualiserBoats(this.boats, getBoatDataSource().getBoats(), getRaceDataSource().getParticipants(), unassignedColors);
         }
     }