From 2f12f3e34fb7d8f19c599598cc15895eb24d77a3 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Tue, 25 Jul 2017 14:27:52 +1200
Subject: [PATCH] Fixed bug to let multiple people play at the same time.

---
 src/main/java/seng302/controllers/LobbyController.java     | 5 +++--
 src/main/java/seng302/gameServer/ServerToClientThread.java | 4 ++--
 src/main/resources/views/StartScreenView.fxml              | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/seng302/controllers/LobbyController.java b/src/main/java/seng302/controllers/LobbyController.java
index a1eaadb6..10bdf35c 100644
--- a/src/main/java/seng302/controllers/LobbyController.java
+++ b/src/main/java/seng302/controllers/LobbyController.java
@@ -239,12 +239,13 @@ public class LobbyController implements Initializable, Observer{
 
     private void playTheme() {
         Random random = new Random(System.currentTimeMillis());
-        if(random.nextInt(11) == 10) {
+        Integer rand = random.nextInt();
+        if(rand == 10) {
             URL file = getClass().getResource("/music/Disturbed - down with the sickness.mp3");
             Media hit = new Media(file.toString());
             mediaPlayer = new MediaPlayer(hit);
             mediaPlayer.play();
-        } else if(random.nextInt(11) == 9) {
+        } else if(rand == 9) {
             URL file = getClass().getResource("/music/Owl City - Fireflies.mp3");
             Media hit = new Media(file.toString());
             mediaPlayer = new MediaPlayer(hit);
diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java
index 106ec27f..85ce5713 100644
--- a/src/main/java/seng302/gameServer/ServerToClientThread.java
+++ b/src/main/java/seng302/gameServer/ServerToClientThread.java
@@ -236,7 +236,7 @@ public class ServerToClientThread implements Runnable, Observer {
             } catch (Exception e) {
                 // TODO: 24/07/17 zyt10 - fix a logic here when a client disconnected
                 serverLog("ERROR OCCURRED, CLOSING SERVER CONNECTION: " + socket.getRemoteSocketAddress().toString(), 1);
-//                e.printStackTrace();
+                e.printStackTrace();
                 closeSocket();
                 return;
             }
@@ -364,7 +364,7 @@ public class ServerToClientThread implements Runnable, Observer {
 //            System.out.println("[SERVER] Lat: " + yacht.getLocation().getLat() + " Lon: " + yacht.getLocation().getLng());
             BoatLocationMessage boatLocationMessage =
                     new BoatLocationMessage(
-                            sourceId,
+                            yacht.getSourceId(),
                             getSeqNo(),
                             yacht.getLocation().getLat(),
                             yacht.getLocation().getLng(),
diff --git a/src/main/resources/views/StartScreenView.fxml b/src/main/resources/views/StartScreenView.fxml
index bfbcf4ee..a5721684 100644
--- a/src/main/resources/views/StartScreenView.fxml
+++ b/src/main/resources/views/StartScreenView.fxml
@@ -37,7 +37,7 @@
          <GridPane.margin>
             <Insets left="5.0" right="5.0" />
          </GridPane.margin></Button>
-      <TextField fx:id="ipTextField" alignment="CENTER" maxWidth="-Infinity" prefHeight="25.0" prefWidth="148.0" promptText="Host IP" text="132.181.14." GridPane.halignment="RIGHT" GridPane.rowIndex="4">
+      <TextField fx:id="ipTextField" alignment="CENTER" maxWidth="-Infinity" prefHeight="25.0" prefWidth="148.0" promptText="Host IP" text="localhost" GridPane.halignment="RIGHT" GridPane.rowIndex="4">
          <GridPane.margin>
             <Insets bottom="10.0" left="5.0" right="85.0" top="10.0" />
          </GridPane.margin>