From 8d9624db96d0d087c555b3131f5a7d77aa153f0b Mon Sep 17 00:00:00 2001 From: Connor Taylor-Brown Date: Thu, 14 Sep 2017 23:01:29 +1200 Subject: [PATCH] Recovered sails smoothing - Boat default position is now overridden only by collision command - Sails command overrides boat velocity #story[1195] --- racevisionGame/src/main/java/mock/model/MockRace.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java index f4549910..9ede32d1 100644 --- a/racevisionGame/src/main/java/mock/model/MockRace.java +++ b/racevisionGame/src/main/java/mock/model/MockRace.java @@ -366,8 +366,8 @@ public class MockRace extends RaceState { //Checks if the current boat has finished the race or not. boolean finish = this.isLastLeg(boat.getCurrentLeg()); - if (!finish && totalElapsedMilliseconds >= updatePeriodMilliseconds && boat.isVelocityDefault()) { - setBoatSpeed(boat); + if (!finish && totalElapsedMilliseconds >= updatePeriodMilliseconds && !boat.isColliding()) { + if(boat.isVelocityDefault()) setBoatSpeed(boat); //Calculates the distance travelled, in meters, in the current timeslice. double distanceTravelledMeters = boat.calculateMetersTravelled(updatePeriodMilliseconds) * this.scaleFactor;