From 1daac842f239bf6adc2eeef5e304033c77dc2cc3 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Mon, 24 Jul 2017 15:01:07 +1200
Subject: [PATCH] Merging game lobby with game state broadcast

---
 src/main/java/seng302/controllers/LobbyController.java     | 2 +-
 src/main/java/seng302/gameServer/ServerToClientThread.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/seng302/controllers/LobbyController.java b/src/main/java/seng302/controllers/LobbyController.java
index 8454d7dd..6aeee7b7 100644
--- a/src/main/java/seng302/controllers/LobbyController.java
+++ b/src/main/java/seng302/controllers/LobbyController.java
@@ -157,7 +157,7 @@ public class LobbyController implements Initializable, Observer{
             if (competitorIndex >= 8) {
                 break;
             }
-            if (!yachtId.equals(ClientState.getClientSourceId())) {
+            if (!yachtId.equals(Integer.parseInt(ClientState.getClientSourceId()))) {
                 competitors.get(competitorIndex).add(String.valueOf(yachtId));
                 competitorIndex++;
             }
diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java
index 5f97b538..343facb5 100644
--- a/src/main/java/seng302/gameServer/ServerToClientThread.java
+++ b/src/main/java/seng302/gameServer/ServerToClientThread.java
@@ -351,7 +351,7 @@ public class ServerToClientThread implements Runnable {
         }
     }
 
-    }
+
 
 
     public Thread getThread() {