From bcb6b79f8d8504ddeafde622dbe07021e3aaa5a2 Mon Sep 17 00:00:00 2001
From: fjc40 <fjc40@uclive.ac.nz>
Date: Tue, 15 Aug 2017 22:41:43 +1200
Subject: [PATCH] Fixed player boat not being highlighted. #story[1095]

---
 racevisionGame/src/main/java/mock/app/Event.java           | 1 -
 .../src/main/java/network/Messages/AssignPlayerBoat.java   | 1 -
 .../Commands/VisualiserRaceCommands/RaceStatusCommand.java | 2 +-
 .../main/java/visualiser/model/VisualiserRaceState.java    | 7 +++++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java
index 6246d699..0d95e1c1 100644
--- a/racevisionGame/src/main/java/mock/app/Event.java
+++ b/racevisionGame/src/main/java/mock/app/Event.java
@@ -5,7 +5,6 @@ import mock.exceptions.EventConstructionException;
 import mock.model.*;
 import mock.model.commandFactory.CompositeCommand;
 import network.Messages.LatestMessages;
-import network.Messages.RaceSnapshot;
 import shared.dataInput.*;
 import shared.enums.XMLFileType;
 import shared.exceptions.InvalidBoatDataException;
diff --git a/racevisionGame/src/main/java/network/Messages/AssignPlayerBoat.java b/racevisionGame/src/main/java/network/Messages/AssignPlayerBoat.java
index c4197fe9..ab33ac1b 100644
--- a/racevisionGame/src/main/java/network/Messages/AssignPlayerBoat.java
+++ b/racevisionGame/src/main/java/network/Messages/AssignPlayerBoat.java
@@ -1,6 +1,5 @@
 package network.Messages;
 
-import network.Messages.Enums.JoinAcceptanceEnum;
 import network.Messages.Enums.MessageType;
 
 
diff --git a/racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/RaceStatusCommand.java b/racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/RaceStatusCommand.java
index 11fd8c3b..825cd274 100644
--- a/racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/RaceStatusCommand.java
+++ b/racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/RaceStatusCommand.java
@@ -103,7 +103,7 @@ public class RaceStatusCommand implements Command {
 
 
         } catch (BoatNotFoundException e) {
-            Logger.getGlobal().log(Level.WARNING, "RaceStatusCommand.updateBoatStatus: " + this + " could not execute. Boat with sourceID: " + boatStatus.getSourceID() + " not found.", e);
+            //Logger.getGlobal().log(Level.WARNING, "RaceStatusCommand.updateBoatStatus: " + this + " could not execute. Boat with sourceID: " + boatStatus.getSourceID() + " not found.", e);
             return;
         }
     }
diff --git a/racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java b/racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java
index 12ddf37d..588c0816 100644
--- a/racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java
+++ b/racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java
@@ -183,7 +183,10 @@ public class VisualiserRaceState extends RaceState {
 
                 boat.setCurrentLeg(getLegs().get(0));
 
-                Platform.runLater(() -> existingBoats.add(boat));
+                Platform.runLater(() -> {
+                    existingBoats.add(boat);
+                    setPlayerBoat();
+                });
 
             }
 
@@ -202,7 +205,7 @@ public class VisualiserRaceState extends RaceState {
 
         if (getPlayerBoatID() != 0) {
 
-            for (VisualiserBoat boat : getBoats()) {
+            for (VisualiserBoat boat : new ArrayList<>(getBoats())) {
 
                 if (boat.getSourceID() == getPlayerBoatID()) {
                     boat.setClientBoat(true);