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

Minor change so that boats still are checked for collision after passing the finish line

Browse Source 
#story[1250]
This commit is contained in:
William Muir
2017-09-11 16:53:12 +12:00
parent 534eaee8ce
commit fdfb5959fa
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/GameState.java
+1 -1
View File
@@ -322,8 +322,8 @@ public class GameState implements Runnable {
checkPowerUpTimeout(yacht); checkPowerUpTimeout(yacht);
yacht.runAutoPilot(); yacht.runAutoPilot();
yacht.updateLocation(timeInterval); yacht.updateLocation(timeInterval);
if (yacht.getBoatStatus() != BoatStatus.FINISHED) {
checkCollision(yacht); checkCollision(yacht);
if (yacht.getBoatStatus() != BoatStatus.FINISHED) {
checkForLegProgression(yacht); checkForLegProgression(yacht);
raceFinished = false; raceFinished = false;
} }
src/main/java/seng302/gameServer/MainServerThread.java
+1 -1
View File
@@ -191,7 +191,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
GameState.spawnNewToken(); GameState.spawnNewToken();
broadcastMessage(MessageFactory.getRaceXML()); broadcastMessage(MessageFactory.getRaceXML());
} }
}, 0, 60000); }, 10000, 60000);
} }
/** /**