From 4ddc369dbcc39d23c1bb3d322cdeefc4bfd1114d Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Thu, 28 Sep 2017 13:49:27 +1300
Subject: [PATCH] Changed Collisions, and merged master

---
 racevisionGame/src/main/java/shared/model/Boat.java             | 2 +-
 .../main/java/visualiser/Controllers/HostGameController.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/racevisionGame/src/main/java/shared/model/Boat.java b/racevisionGame/src/main/java/shared/model/Boat.java
index a094bcc9..99871678 100644
--- a/racevisionGame/src/main/java/shared/model/Boat.java
+++ b/racevisionGame/src/main/java/shared/model/Boat.java
@@ -418,7 +418,7 @@ public class Boat extends Collider {
     @Override
     public boolean rayCast(Boat boat) {
         if(boat != this) {
-            return rayCast(boat, 50);
+            return rayCast(boat, 15);
         } else return false;
     }
 
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
index dac62be0..da8d913d 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
@@ -62,7 +62,7 @@ public class HostGameController extends Controller {
         });
 
         // set values and marks to be displayed
-        sliderLength.setMin(2);
+        sliderLength.setMin(5);
         sliderLength.setMax(MAX_RACE_LENGTH);
         sliderLength.setShowTickLabels(true);
         sliderLength.setMajorTickUnit(MAX_RACE_LENGTH-1);