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

Merge remote-tracking branch 'origin/develop' into issue47_disconnect_crash_rebranch

Browse Source 
# Conflicts:
#	src/main/java/seng302/gameServer/ServerToClientThread.java
#	src/main/java/seng302/visualiser/controllers/RaceViewController.java
This commit is contained in:
Alistair McIntyre
2017-08-17 14:36:16 +12:00
parent d41bdfebbc 2331942bf9
commit 978def4cf7
5 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/GameClient.java
+5 -5
View File
@@ -325,6 +325,7 @@ public class GameClient {
raceState.getRaceTime() - roundingData.getTimeStamp()
);
}
updatePlayerPositions();
}
private void processRaceStatusUpdate(RaceStatusData data) {
@@ -341,12 +342,11 @@ public class GameClient {
ClientYacht clientYacht = allBoatsMap.get((int) boatData[0]);
clientYacht.setEstimateTimeTillNextMark(raceState.getRaceTime() - boatData[1]);
clientYacht.setEstimateTimeAtFinish(boatData[2]);
int legNumber = (int) boatData[3];
// int legNumber = (int) boatData[3];
clientYacht.setBoatStatus((int) boatData[4]);
if (legNumber != clientYacht.getLegNumber()) {
clientYacht.setLegNumber(legNumber);
updatePlayerPositions();
}
// if (legNumber != clientYacht.getLegNumber()) {
// clientYacht.setLegNumber(legNumber);
// }
}
if (raceFinished) {