fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed player boat not being highlighted.

Browse Source 
#story[1095]
This commit is contained in:
fjc40
2017-08-15 22:41:43 +12:00
parent a4755ed88b
commit bcb6b79f8d
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/mock/app/Event.java
-1
View File
@@ -5,7 +5,6 @@ import mock.exceptions.EventConstructionException;
import mock.model.*; import mock.model.*;
import mock.model.commandFactory.CompositeCommand; import mock.model.commandFactory.CompositeCommand;
import network.Messages.LatestMessages; import network.Messages.LatestMessages;
import network.Messages.RaceSnapshot;
import shared.dataInput.*; import shared.dataInput.*;
import shared.enums.XMLFileType; import shared.enums.XMLFileType;
import shared.exceptions.InvalidBoatDataException; import shared.exceptions.InvalidBoatDataException;
racevisionGame/src/main/java/network/Messages/AssignPlayerBoat.java
-1
View File
@@ -1,6 +1,5 @@
package network.Messages; package network.Messages;
import network.Messages.Enums.JoinAcceptanceEnum;
import network.Messages.Enums.MessageType; import network.Messages.Enums.MessageType;
racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/RaceStatusCommand.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class RaceStatusCommand implements Command {
} catch (BoatNotFoundException e) { } catch (BoatNotFoundException e) {
Logger.getGlobal().log(Level.WARNING, "RaceStatusCommand.updateBoatStatus: " + this + " could not execute. Boat with sourceID: " + boatStatus.getSourceID() + " not found.", e); //Logger.getGlobal().log(Level.WARNING, "RaceStatusCommand.updateBoatStatus: " + this + " could not execute. Boat with sourceID: " + boatStatus.getSourceID() + " not found.", e);
return; return;
} }
} }
racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java
+5 -2
View File
@@ -183,7 +183,10 @@ public class VisualiserRaceState extends RaceState {
boat.setCurrentLeg(getLegs().get(0)); boat.setCurrentLeg(getLegs().get(0));
Platform.runLater(() -> existingBoats.add(boat)); Platform.runLater(() -> {
existingBoats.add(boat);
setPlayerBoat();
});
} }
@@ -202,7 +205,7 @@ public class VisualiserRaceState extends RaceState {
if (getPlayerBoatID() != 0) { if (getPlayerBoatID() != 0) {
for (VisualiserBoat boat : getBoats()) { for (VisualiserBoat boat : new ArrayList<>(getBoats())) {
if (boat.getSourceID() == getPlayerBoatID()) { if (boat.getSourceID() == getPlayerBoatID()) {
boat.setClientBoat(true); boat.setClientBoat(true);