Merge remote-tracking branch 'remotes/origin/boat_collision_fix' into ac35_map_boundary

main
hba56 8 years ago
commit c2de45ce01

@ -109,8 +109,6 @@ public class MockRace extends RaceState {
colliderRegistry.addCollider(mark.getMark1()); colliderRegistry.addCollider(mark.getMark1());
if(mark.getMark2() != null) colliderRegistry.addCollider(mark.getMark2()); 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.boats.add(mockBoat);
this.activeObserverCommands.put(boat.getSourceID(), new ActiveObserverCommand()); this.activeObserverCommands.put(boat.getSourceID(), new ActiveObserverCommand());
this.colliderRegistry.addCollider(mockBoat);
getRaceDataSource().incrementSequenceNumber(); getRaceDataSource().incrementSequenceNumber();
} }
/** /**

@ -418,7 +418,7 @@ public class Boat extends Collider {
@Override @Override
public boolean rayCast(Boat boat) { public boolean rayCast(Boat boat) {
if(boat != this) { if(boat != this) {
return rayCast(boat, 15); return rayCast(boat, 50);
} else return false; } else return false;
} }

Loading…
Cancel
Save