From 8b8b6e4afab9584e7dbdbdefae1e2908df6c7f7b Mon Sep 17 00:00:00 2001 From: Michael Rausch Date: Sun, 23 Jul 2017 18:20:13 +1200 Subject: [PATCH] Fixed map glitch when race starts, and race XML bug - Race XML wasn't being sent to clients, this was causing a null ptr exception - Boat location was being set to an invalid lat/lng Tags: #story[1047] --- src/main/java/seng302/controllers/CanvasController.java | 1 + src/main/java/seng302/gameServer/ServerToClientThread.java | 2 +- src/main/java/seng302/models/Yacht.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java index c13c9bcb..06558675 100644 --- a/src/main/java/seng302/controllers/CanvasController.java +++ b/src/main/java/seng302/controllers/CanvasController.java @@ -420,6 +420,7 @@ public class CanvasController { */ private void findMinMaxPoint() { List sortedPoints = new ArrayList<>(); + for (Limit limit : ClientPacketParser.getXmlObject().getRaceXML().getCourseLimit()) { sortedPoints.add(limit); } diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java index 9e121ea0..8f61a091 100644 --- a/src/main/java/seng302/gameServer/ServerToClientThread.java +++ b/src/main/java/seng302/gameServer/ServerToClientThread.java @@ -45,7 +45,7 @@ public class ServerToClientThread implements Runnable { private Boolean userIdentified = false; private Boolean connected = true; private Boolean updateClient = true; - private Boolean initialisedRace = false; + private Boolean initialisedRace = true; private Integer seqNo; private Integer sourceId; diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java index bfc15165..60b5eb27 100644 --- a/src/main/java/seng302/models/Yacht.java +++ b/src/main/java/seng302/models/Yacht.java @@ -108,7 +108,7 @@ public class Yacht { this.country = country; this.position = "-"; this.sailIn = false; - this.location = new GeoPoint(0.0, 0.0); + this.location = new GeoPoint(57.6679590, 11.8503233); this.heading = 0.0; this.velocity = 0.0; }