Finish screen now displays correctly on finishing.

GameState update now checks for finishing the race
Can now go back to main menu from finish screen
Labeled all threads for better debugging
Still need to implement race list ordering and finish screen ordering

src/main/java/seng302/model/ServerYacht.java

@@ -42,12 +42,11 @@ public class ServerYacht extends Observable {
     private Double autoHeading;
 
     //Mark Rounding
-    private Integer currentMarkSeqID = 0;
+    private Integer currentMarkSeqID;
     private Boolean hasEnteredRoundingZone;
     private Mark closestCurrentMark;
     private Boolean hasPassedLine;
     private Boolean hasPassedThroughGate;
-    private Boolean finishedRace;
 
 
     public ServerYacht(String boatType, Integer sourceId, String hullID, String shortName,
@@ -65,11 +64,11 @@ public class ServerYacht extends Observable {
         this.lastLocation = location;
         this.heading = 120.0;   //In degrees
         this.currentVelocity = 0d;     //in mms-1
+        this.currentMarkSeqID = 0;
 
         this.hasEnteredRoundingZone = false;
         this.hasPassedLine = false;
         this.hasPassedThroughGate = false;
-        this.finishedRace = false;
     }
 
 
@@ -322,15 +321,6 @@ public class ServerYacht extends Observable {
         return boatName;
     }
 
-
-    public void setIsFinished(Boolean isFinished) {
-        finishedRace = isFinished;
-    }
-
-    public Boolean getFinishedRace() {
-        return finishedRace;
-    }
-
     public Double getCurrentVelocity() {
         return currentVelocity;
     }