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 branch 'develop' into Story1278_keybindings

Browse Source 
# Conflicts:
#	src/main/java/seng302/model/ServerYacht.java
This commit is contained in:
Haoming Yin
2017-09-25 11:06:28 +13:00
parent 8dfdb228e9 64245833cd
commit 44275aec04
10 changed files with 158 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/controllers/LobbyController.java
+1 -1
View File
@@ -131,7 +131,7 @@ public class LobbyController implements Initializable {
.get(ViewManager.getInstance().getGameClient().getServerThread().getClientId())
.getBoatName());
controller.setCurrentBoat(this.playerBoats.get(ViewManager.getInstance().getGameClient().getServerThread().getClientId())
.getBoatType());
.getBoatType().toString());
return customizationDialog;
}