From e434af07280cec70d638c9d554623f07899a4b3b Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 28 Sep 2017 01:29:58 +1300 Subject: [PATCH] fixed boat collisions. Increased boat collision radius 15 -> 50 --- racevisionGame/src/main/java/mock/model/MockRace.java | 4 +--- racevisionGame/src/main/java/shared/model/Boat.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java index a0140189..969d9d94 100644 --- a/racevisionGame/src/main/java/mock/model/MockRace.java +++ b/racevisionGame/src/main/java/mock/model/MockRace.java @@ -109,8 +109,6 @@ public class MockRace extends RaceState { colliderRegistry.addCollider(mark.getMark1()); if(mark.getMark2() != null) colliderRegistry.addCollider(mark.getMark2()); } - - this.colliderRegistry.addAllColliders(boats); } @@ -133,9 +131,9 @@ public class MockRace extends RaceState { this.boats.add(mockBoat); this.activeObserverCommands.put(boat.getSourceID(), new ActiveObserverCommand()); + this.colliderRegistry.addCollider(mockBoat); getRaceDataSource().incrementSequenceNumber(); - } /** diff --git a/racevisionGame/src/main/java/shared/model/Boat.java b/racevisionGame/src/main/java/shared/model/Boat.java index 99871678..a094bcc9 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, 15); + return rayCast(boat, 50); } else return false; }