Merge branch 'develop' into Story80_BoatCustomization

This commit is contained in:
Alistair McIntyre
2017-08-14 14:23:05 +12:00
13 changed files with 305 additions and 17 deletions
@@ -27,6 +27,7 @@ public class MainServerThread extends Observable implements Runnable, ClientConn
private ArrayList<ServerToClientThread> serverToClientThreads = new ArrayList<>();
public MainServerThread() {
new GameState("localhost");
try {
serverSocket = new ServerSocket(PORT);
} catch (IOException e) {