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

Merged Develop into branch.

Browse Source 
tags : #story[1142]
This commit is contained in:
Alistair McIntyre
2017-08-17 13:40:00 +12:00
parent 39cfaf6780
commit 5fc7442359
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/GameClient.java
+2 -2
View File
@@ -95,7 +95,7 @@ public class GameClient {
/** /**
* Connect to a game as the host at the given address and starts the visualiser. * Connect to a game as the host at the given address and starts the visualiser.
* @param ipAddress IP to connect to. * @param ipAdclientYachtsdress IP to connect to.
* @param portNumber Port to connect to. * @param portNumber Port to connect to.
*/ */
public void runAsHost(String ipAddress, Integer portNumber) { public void runAsHost(String ipAddress, Integer portNumber) {
@@ -130,7 +130,7 @@ public class GameClient {
}); });
this.lobbyController = lobbyController; this.lobbyController = lobbyController;
server.setGameClient(this); //server.setGameClient(this);
} }
private void loadStartScreen() { private void loadStartScreen() {
src/main/java/seng302/visualiser/GameView.java
+1 -1
View File
@@ -474,7 +474,7 @@ public class GameView extends Pane {
public void setBoats(List<ClientYacht> yachts) { public void setBoats(List<ClientYacht> yachts) {
BoatObject newBoat; BoatObject newBoat;
final List<Group> wakes = new ArrayList<>(); final List<Group> wakes = new ArrayList<>();
for (ClientYacht clientYacht : clientYachts) { for (ClientYacht clientYacht : yachts) {
Paint colour = clientYacht.getColour(); Paint colour = clientYacht.getColour();
newBoat = new BoatObject(); newBoat = new BoatObject();
newBoat.addSelectedBoatListener(this::setSelectedBoat); newBoat.addSelectedBoatListener(this::setSelectedBoat);