michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'issue_#67_early_start' into 'develop'

Browse Source 
added a check in the start logic to make sure a boat can't cross the start line early



See merge request !74
This commit is contained in:
Haoming Yin
2017-09-27 19:42:05 +13:00
parent efc71f2003 870d7a6e82
commit c5d2016733
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/GameState.java
+4
View File
@@ -736,6 +736,10 @@ public class GameState implements Runnable {
* @param yacht The current yacht to check for * @param yacht The current yacht to check for
*/ */
private Boolean checkStartLineCrossing(ServerYacht yacht) { private Boolean checkStartLineCrossing(ServerYacht yacht) {
long timeTillStart = System.currentTimeMillis() - this.getStartTime();
if (timeTillStart < 0){
return false;
}
Integer currentMarkSeqID = yacht.getCurrentMarkSeqID(); Integer currentMarkSeqID = yacht.getCurrentMarkSeqID();
CompoundMark currentMark = markOrder.getCurrentMark(currentMarkSeqID); CompoundMark currentMark = markOrder.getCurrentMark(currentMarkSeqID);
GeoPoint lastLocation = yacht.getLastLocation(); GeoPoint lastLocation = yacht.getLastLocation();