From ed2a22b573c63a80cff2f827a434c3b6561939f7 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Sun, 23 Jul 2017 17:37:45 +1200
Subject: [PATCH] Tried to merge game loop with the broadcast. Minor error in
 canvas. need to fix.

#story[1047]
---
 .../java/seng302/controllers/LobbyController.java    |  1 -
 .../seng302/controllers/StartScreenController.java   |  3 +--
 .../seng302/gameServer/ServerToClientThread.java     | 12 +++++-------
 src/main/java/seng302/models/Yacht.java              |  5 +----
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/main/java/seng302/controllers/LobbyController.java b/src/main/java/seng302/controllers/LobbyController.java
index 565812cc..eb3d7b75 100644
--- a/src/main/java/seng302/controllers/LobbyController.java
+++ b/src/main/java/seng302/controllers/LobbyController.java
@@ -104,6 +104,5 @@ public class LobbyController implements Initializable{
     public void readyButtonPressed() {
         GameState.setCurrentStage(GameStages.RACING);
         setContentPane("/views/RaceView.fxml");
-
     }
 }
diff --git a/src/main/java/seng302/controllers/StartScreenController.java b/src/main/java/seng302/controllers/StartScreenController.java
index f5c75155..588e1b57 100644
--- a/src/main/java/seng302/controllers/StartScreenController.java
+++ b/src/main/java/seng302/controllers/StartScreenController.java
@@ -62,13 +62,12 @@ public class StartScreenController {
         try {
             String ipAddress = InetAddress.getLocalHost().getHostAddress();
             new GameState(ipAddress);
-            new MainServerThread()
+            new MainServerThread();
             ClientToServerThread clientToServerThread = new ClientToServerThread("localhost", 4950);
             controller.setClientToServerThread(clientToServerThread);
 //            new GameServerThread("Fuck you");
             // get the lobby controller so that we can pass the game server thread to it
             setContentPane("/views/LobbyView.fxml");
-
         } catch (UnknownHostException e) {
             System.err.println("COULD NOT FIND YOUR IP ADDRESS!");
             e.printStackTrace();
diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java
index 0fc2c71c..9e121ea0 100644
--- a/src/main/java/seng302/gameServer/ServerToClientThread.java
+++ b/src/main/java/seng302/gameServer/ServerToClientThread.java
@@ -64,18 +64,16 @@ public class ServerToClientThread implements Runnable {
         sourceId = GameState.getUniquePlayerID();
         if (threeWayHandshake(sourceId)) {
             serverLog("Successful handshake. Client allocated id: " + sourceId, 1);
-            GameState.addYacht(sourceId,
-                new Yacht("Kappa", "Kap", new GeoPoint(0.0, 0.0), 0.0));
-            GameState.addPlayer(new Player(socket));      //Is this neccesary???
+            Yacht yacht = new Yacht("Yacht", sourceId, sourceId.toString(), "Kap", "Kappa", "NZ");
+//        Yacht yacht = new Yacht("Kappa", "Kap", new GeoPoint(57.6708220, 11.8321340), 90.0);
+            GameState.addYacht(sourceId, yacht);
+            GameState.addPlayer(new Player(socket, yacht));
         } else {
             serverLog("Unsuccessful handshake. Connection rejected", 1);
             closeSocket();
             return;
         }
-        Yacht yacht = new Yacht("Yacht", sourceId, sourceId.toString(), "Kap", "Kappa", "NZ");
-//        Yacht yacht = new Yacht("Kappa", "Kap", new GeoPoint(57.6708220, 11.8321340), 90.0);
-        GameState.addYacht(sourceId, yacht);
-        GameState.addPlayer(new Player(socket, yacht));
+
         seqNo = 0;
         thread = new Thread(this);
         thread.start();
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 4bcd5de6..bfc15165 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -93,7 +93,7 @@ public class Yacht {
         this.boatName = boatName;
         this.velocity = boatVelocity;
         this.shortName = shortName;
-        this.sourceID = id;
+        this.sourceId = id;
         this.sailIn = false;
     }
 
@@ -339,7 +339,4 @@ public class Yacht {
         return location;
     }
 
-    public Double getHeading() {
-        return heading;
-    }
 }