From ce5424cc797526c4cbbce97136408cc4005ee700 Mon Sep 17 00:00:00 2001
From: Zhi You Tan <ryan_zhiyou@hotmail.com>
Date: Tue, 15 Aug 2017 14:53:15 +1200
Subject: [PATCH] Fixed develop merge and now collision works

---
 .../seng302/gameServer/MainServerThread.java  |  2 --
 .../gameServer/ServerToClientThread.java      | 28 +------------------
 .../java/seng302/visualiser/GameView.java     |  1 -
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/src/main/java/seng302/gameServer/MainServerThread.java b/src/main/java/seng302/gameServer/MainServerThread.java
index 74a70dd1..441cca7a 100644
--- a/src/main/java/seng302/gameServer/MainServerThread.java
+++ b/src/main/java/seng302/gameServer/MainServerThread.java
@@ -146,8 +146,6 @@ public class MainServerThread extends Observable implements Runnable, ClientConn
             }
         }
         serverToClientThreads.remove(closedConnection);
-        setChanged();
-        notifyObservers("send setup message");
     }
 
     public void startGame() {
diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java
index 767ebc77..d60700f7 100644
--- a/src/main/java/seng302/gameServer/ServerToClientThread.java
+++ b/src/main/java/seng302/gameServer/ServerToClientThread.java
@@ -37,13 +37,6 @@ import seng302.gameServer.server.messages.RegistrationResponseMessage;
 import seng302.gameServer.server.messages.RegistrationResponseStatus;
 import seng302.gameServer.server.messages.XMLMessage;
 import seng302.gameServer.server.messages.XMLMessageSubType;
-import seng302.model.Player;
-import seng302.model.Yacht;
-import seng302.model.stream.packets.PacketType;
-import seng302.model.stream.packets.StreamPacket;
-import seng302.model.stream.xml.generator.Race;
-import seng302.model.stream.xml.generator.Regatta;
-import seng302.utilities.XMLGenerator;
 
 /**
  * A class describing a single connection to a Client for the purposes of sending and receiving on
@@ -121,23 +114,11 @@ public class ServerToClientThread implements Runnable {
                                 "/server_config/CSV_Database_of_Last_Names.csv"
                         )
                 )
-            );
-            all = ln.lines().collect(Collectors.toList());
-            lName = all.get(ThreadLocalRandom.current().nextInt(0, all.size()));
-        } catch (IOException e) {
-            serverLog("IO error in server thread upon grabbing streams", 1);
-        }
-        //Attempt threeway handshake with connection
-        sourceId = GameState.getUniquePlayerID();
-        if (threeWayHandshake(sourceId)) {
-            serverLog("Successful handshake. Client allocated id: " + sourceId, 0);
-            yacht = new Yacht(
         );
         all = ln.lines().collect(Collectors.toList());
         lName = all.get(ThreadLocalRandom.current().nextInt(0, all.size()));
 
-
-        Yacht yacht = new Yacht(
+        yacht = new Yacht(
                 "Yacht", sourceId, sourceId.toString(), fName, fName + " " + lName, "NZ"
         );
         GameState.addYacht(sourceId, yacht);
@@ -151,13 +132,6 @@ public class ServerToClientThread implements Runnable {
         }
     }
 
-    @Override
-    public void update(Observable o, Object arg) {
-        if (arg.equals("send setup message")) {
-            sendSetupMessages();
-        }
-    }
-
     private void completeRegistration(ClientType clientType) throws IOException {
         // Fail if not a player
         if (!clientType.equals(ClientType.PLAYER)){
diff --git a/src/main/java/seng302/visualiser/GameView.java b/src/main/java/seng302/visualiser/GameView.java
index f042ddde..67e46880 100644
--- a/src/main/java/seng302/visualiser/GameView.java
+++ b/src/main/java/seng302/visualiser/GameView.java
@@ -623,7 +623,6 @@ public class GameView extends Pane {
         timer.start();
     }
 
-    public void setBoatAsPlayer(Yacht playerYacht) {
     public Yacht getPlayerYacht() {
         return playerYacht;
     }