diff --git a/Assets/Raindrop/UI/LoadingScreen/LoadingController.cs b/Assets/Raindrop/UI/LoadingScreen/LoadingController.cs index 67f9e26..0cd4181 100644 --- a/Assets/Raindrop/UI/LoadingScreen/LoadingController.cs +++ b/Assets/Raindrop/UI/LoadingScreen/LoadingController.cs @@ -36,9 +36,10 @@ namespace Raindrop.UI.LoadingScreen private void RemoveLoginEvents() { + if (netcom == null) + return; netcom.ClientLoggingIn -= new EventHandler(netcom_ClientLoggingIn); netcom.ClientLoginStatus -= new EventHandler(netcom_ClientLoginStatus); - } diff --git a/Assets/Raindrop/UI/Map/Map_SceneHierachy/MapScenePresenter.cs b/Assets/Raindrop/UI/Map/Map_SceneHierachy/MapScenePresenter.cs index 32edf67..c3c6780 100644 --- a/Assets/Raindrop/UI/Map/Map_SceneHierachy/MapScenePresenter.cs +++ b/Assets/Raindrop/UI/Map/Map_SceneHierachy/MapScenePresenter.cs @@ -104,6 +104,7 @@ namespace Raindrop.UI.map.Map_SceneHierachy Client.Grid.GridRegion -= new EventHandler(Grid_GridRegion); Client.Grid.GridLayer -= new EventHandler(Grid_GridLayer); + if (Instance == null) return; Instance.Netcom.ClientConnected -= NetcomOnClientConnected; Instance.Netcom.ClientDisconnected -= NetcomOnClientDisconnected; }