From bd7ea920b671fe6cdf70598ce936814801b3314f Mon Sep 17 00:00:00 2001
From: William Muir <wmu16@uclive.ac.nz>
Date: Sat, 9 Sep 2017 14:46:42 +1200
Subject: [PATCH] Fixed Client connection delegate bug

#story[1250]
---
 src/main/java/seng302/gameServer/MainServerThread.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/seng302/gameServer/MainServerThread.java b/src/main/java/seng302/gameServer/MainServerThread.java
index ad423f19..3c305f90 100644
--- a/src/main/java/seng302/gameServer/MainServerThread.java
+++ b/src/main/java/seng302/gameServer/MainServerThread.java
@@ -223,12 +223,14 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
         ServerToClientThread closedConnection = null;
         for (ServerToClientThread serverToClientThread : serverToClientThreads) {
             if (serverToClientThread.getSocket() == player.getSocket()) {
-                serverToClientThreads.remove(closedConnection);
-                closedConnection.terminate();
+                closedConnection = serverToClientThread;
             }
         }
 
-        if (GameState.getCurrentStage() != GameStages.RACING) {
+        serverToClientThreads.remove(closedConnection);
+        closedConnection.terminate();
+
+        if (GameState.getCurrentStage() == GameStages.LOBBYING) {
             sendSetupMessages();
         }
     }