From 25d8c8f9c4f9db20e3075b6e9896cebfe2db30f7 Mon Sep 17 00:00:00 2001
From: Michael Rausch <mra106@uclive.ac.nz>
Date: Thu, 27 Jul 2017 14:15:55 +1200
Subject: [PATCH] Minor bug fixes.

Server will now only save incoming connections if in lobbying mode as it should
Commented out boat status printing

tags: #story[1047]
---
 .../java/seng302/gameServer/GameState.java     | 18 +++++++++++-------
 .../seng302/gameServer/ServerListenThread.java |  4 +++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java
index 39ba44b4..16eb8050 100644
--- a/src/main/java/seng302/gameServer/GameState.java
+++ b/src/main/java/seng302/gameServer/GameState.java
@@ -136,13 +136,7 @@ public class GameState implements Runnable {
                 break;
         }
 
-        System.out.println("-----------------------");
-        System.out.println("Sails are in: " + playerYacht.getSailIn());
-        System.out.println("Heading: " + playerYacht.getHeading());
-        System.out.println("Velocity: " + playerYacht.getVelocityMMS() / 1000);
-        System.out.println("Lat: " + playerYacht.getLocation().getLat());
-        System.out.println("Lng: " + playerYacht.getLocation().getLng());
-        System.out.println("-----------------------\n");
+//        printBoatStatus(playerYacht);
     }
 
     public static void update() {
@@ -186,4 +180,14 @@ public class GameState implements Runnable {
             }
         }
     }
+
+    private static void printBoatStatus(Yacht playerYacht) {
+        System.out.println("-----------------------");
+        System.out.println("Sails are in: " + playerYacht.getSailIn());
+        System.out.println("Heading: " + playerYacht.getHeading());
+        System.out.println("Velocity: " + playerYacht.getVelocityMMS() / 1000);
+        System.out.println("Lat: " + playerYacht.getLocation().getLat());
+        System.out.println("Lng: " + playerYacht.getLocation().getLng());
+        System.out.println("-----------------------\n");
+    }
 }
diff --git a/src/main/java/seng302/gameServer/ServerListenThread.java b/src/main/java/seng302/gameServer/ServerListenThread.java
index f36d08df..475f2cd9 100644
--- a/src/main/java/seng302/gameServer/ServerListenThread.java
+++ b/src/main/java/seng302/gameServer/ServerListenThread.java
@@ -27,9 +27,11 @@ public class ServerListenThread extends Thread{
     private void acceptConnection() {
         try {
             Socket thisClient = serverSocket.accept();
-            if (thisClient != null){
+            if (thisClient != null && GameState.getCurrentStage().equals(GameStages.LOBBYING)) {
                 ServerToClientThread thisConnection = new ServerToClientThread(thisClient);
                 delegate.clientConnected(thisConnection);
+            } else {
+                thisClient.close();
             }
         } catch (IOException e) {
             e.getMessage();