diff --git a/src/main/java/electrosphere/engine/Globals.java b/src/main/java/electrosphere/engine/Globals.java index a41f73cc..cb4aad1d 100644 --- a/src/main/java/electrosphere/engine/Globals.java +++ b/src/main/java/electrosphere/engine/Globals.java @@ -595,6 +595,9 @@ public class Globals { Globals.playerEntity = null; Globals.playerCamera = null; Globals.firstPersonEntity = null; + Globals.clientPlayer = null; + clientScene = new Scene(); + clientSceneWrapper = new ClientSceneWrapper(clientScene, new CollisionEngine()); } diff --git a/src/main/java/electrosphere/engine/loadingthreads/MainMenuLoading.java b/src/main/java/electrosphere/engine/loadingthreads/MainMenuLoading.java index 1900d84f..bafbd045 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/MainMenuLoading.java +++ b/src/main/java/electrosphere/engine/loadingthreads/MainMenuLoading.java @@ -37,10 +37,7 @@ public class MainMenuLoading { // //reveal in game main menu - Window inGameMainMenu = (Window)Globals.elementManager.getWindow(WindowStrings.WINDOW_MENU_INGAME_MAIN); - if(inGameMainMenu != null){ - WindowUtils.recursiveSetVisible(inGameMainMenu,false); - } + WindowUtils.closeWindow(WindowStrings.WINDOW_MENU_INGAME_MAIN); MainMenuLoading.loadMainMenu(params); }