Merge branch 'master' into spectate_mode_basic

# Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
2017-09-15 00:46:07 +12:00
parent 43a1fbcb64 a6aeab5ee3
commit eb2ed45ed2
64 changed files with 1133 additions and 191 deletions
@@ -81,6 +81,9 @@ public class HostGameController extends Controller {
     */
    public void alertMatchBrowser(){
        try{
+            if (matchBrowserInterface == null){
+                return;//private game
+            }
            matchBrowserInterface.startSendingHostData(App.game.getHostedGameData(), udpSocket);
        }catch (IOException e){
            System.err.println("failed to send out hosted game info");