From 482d98783941a2147b64c192556cc53d6a736068 Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Thu, 14 Sep 2017 15:10:48 +1200
Subject: [PATCH] - Fixed Null Pointer - Build Should pass

Tags: #story[1245]
---
 src/main/java/seng302/visualiser/GameClient.java       |  4 ++--
 .../visualiser/controllers/RaceViewController.java     |  1 -
 .../seng302/gameServer/server/ChatCommandsTest.java    | 10 +++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/seng302/visualiser/GameClient.java b/src/main/java/seng302/visualiser/GameClient.java
index 87511a5a..7040d7ee 100644
--- a/src/main/java/seng302/visualiser/GameClient.java
+++ b/src/main/java/seng302/visualiser/GameClient.java
@@ -341,10 +341,10 @@ public class GameClient {
             }
 
             if (raceFinished) {
-                System.out.println(raceViewController);
                 raceViewController.showFinishDialog(finishedBoats);
                 Sounds.playFinishSound();
                 close();
+                ViewManager.getInstance().getGameClient().stopGame();
                 //loadFinishScreenView();
             }
             raceState.setRaceFinished();
@@ -450,7 +450,7 @@ public class GameClient {
         if (server != null) server.terminate();
         if (socketThread != null) socketThread.setSocketToClose();
         server = null;
-        socketThread = null;
+//        socketThread = null;
     }
 
     public Map<Integer, ClientYacht> getAllBoatsMap() {
diff --git a/src/main/java/seng302/visualiser/controllers/RaceViewController.java b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
index 7a5ac3b6..babbab5f 100644
--- a/src/main/java/seng302/visualiser/controllers/RaceViewController.java
+++ b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
@@ -200,7 +200,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     public void showFinishDialog(ArrayList<ClientYacht> finishedBoats) {
         raceState.setRaceStarted(false);
         finishDialogController.setFinishedBoats(finishedBoats);
-        ViewManager.getInstance().getGameClient().stopGame();
         finishScreenDialog.show();
     }
 
diff --git a/src/test/java/seng302/gameServer/server/ChatCommandsTest.java b/src/test/java/seng302/gameServer/server/ChatCommandsTest.java
index 221a6782..cb0bc930 100644
--- a/src/test/java/seng302/gameServer/server/ChatCommandsTest.java
+++ b/src/test/java/seng302/gameServer/server/ChatCommandsTest.java
@@ -61,7 +61,7 @@ public class ChatCommandsTest {
             } catch (InterruptedException ie) {
                 ie.printStackTrace();
             }
-            host.sendChatterMessage("[time_prefix] <name_prefix> >finish");
+            host.sendChatterMessage("[time_prefix] <name_prefix> /finish");
             dcSent = true;
             try {
                 Thread.sleep(2000);
@@ -104,7 +104,7 @@ public class ChatCommandsTest {
             ie.printStackTrace();
         }
         mst.startGame();
-        host.sendChatterMessage("[time_prefix] <name_prefix> >speed 5");
+        host.sendChatterMessage("[time_prefix] <name_prefix> /speed 5");
         try {
             Thread.sleep(100);
         } catch (InterruptedException ie) {
@@ -143,7 +143,7 @@ public class ChatCommandsTest {
             ie.printStackTrace();
         }
         mst.startGame();
-        host.sendChatterMessage("[time_prefix] <name_prefix> >speed fdgdgdfg");
+        host.sendChatterMessage("[time_prefix] <name_prefix> /speed fdgdgdfg");
         try {
             Thread.sleep(100);
         } catch (InterruptedException ie) {
@@ -188,7 +188,7 @@ public class ChatCommandsTest {
         } catch (InterruptedException ie) {
             ie.printStackTrace();
         }
-        client.sendChatterMessage("[time_prefix] <name_prefix> >speed 5.0");
+        client.sendChatterMessage("[time_prefix] <name_prefix> /speed 5.0");
         try {
             Thread.sleep(200);
         } catch (InterruptedException ie) {
@@ -248,7 +248,7 @@ public class ChatCommandsTest {
         } catch (IOException ioe) {
             ioe.printStackTrace();
         }
-        host.sendChatterMessage("[time_prefix] <name_prefix> >finish");
+        host.sendChatterMessage("[time_prefix] <name_prefix> /finish");
         dcSent = true;
     }
 }