Merge branch 'develop' into issue47_disconnect_crash_rebranch

# Conflicts: # src/main/java/seng302/visualiser/GameClient.java # src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java
2026-05-09 14:28:43 +00:00 · 2017-08-17 12:16:14 +12:00
parent 769d1956b3 8ca455ed24
commit ef2659a7b9
3 changed files with 50 additions and 49 deletions
@@ -130,7 +130,6 @@ public class GameClient {
                }
            });
            this.lobbyController = lobbyController;
-            server.setGameClient(this);
        } catch (IOException ioe) {
            showConnectionError("Cannot connect to server as host");
            Platform.runLater(this::loadStartScreen);