Move on client stop (#118)

BREAKING CHANGE: OnStopClient virtual is replaced by event in Client
MirageNet · Mar 25, 2020 · 678e386 · 678e386
1 parent 27fbcd7
commit 678e386
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/Assets/Mirror/Components/NetworkRoomManager.cs b/Assets/Mirror/Components/NetworkRoomManager.cs
@@ -79,6 +79,7 @@ public struct PendingPlayer
         void Awake()
         {
             client.Authenticated.AddListener(OnAuthenticated);
+            client.Disconnected.AddListener(Disconnected);
         }
 
         public override void Start()
@@ -449,9 +450,9 @@ public override void OnClientDisconnect(NetworkConnection conn)
         }
 
         /// <summary>
-        /// This is called when a client is stopped.
+        /// This is invoked when a client is stopped.
         /// </summary>
-        public override void OnStopClient()
+        public void Disconnected()
         {
             OnRoomStopClient();
             CallOnClientExitRoom();

diff --git a/Assets/Mirror/Examples/AdditiveScenes/Scripts/AdditiveNetworkManager.cs b/Assets/Mirror/Examples/AdditiveScenes/Scripts/AdditiveNetworkManager.cs
@@ -11,6 +11,11 @@ public class AdditiveNetworkManager : NetworkManager
         [Tooltip("Add all sub-scenes to this list")]
         public string[] subScenes;
 
+        void Awake()
+        {
+            client.Disconnected.AddListener(Disconnected);
+        }
+
         public override void OnStartServer()
         {
             base.OnStartServer();
@@ -35,7 +40,7 @@ public override void OnStopServer()
             StartCoroutine(UnloadScenes());
         }
 
-        public override void OnStopClient()
+        public void Disconnected()
         {
             StartCoroutine(UnloadScenes());
         }

diff --git a/Assets/Mirror/Runtime/NetworkClient.cs b/Assets/Mirror/Runtime/NetworkClient.cs
@@ -39,6 +39,7 @@ public class NetworkClient : MonoBehaviour
 
         public NetworkConnectionEvent Connected = new NetworkConnectionEvent();
         public NetworkConnectionEvent Authenticated = new NetworkConnectionEvent();
+        public UnityEvent Disconnected = new UnityEvent();
 
         /// <summary>
         /// The NetworkConnection object this client is using.
@@ -529,6 +530,8 @@ internal void HandleClientDisconnect(NetworkConnection conn)
                 ready = false;
                 connection = null;
             }
+
+            Disconnected.Invoke();
         }
 
         /// <summary>

diff --git a/Assets/Mirror/Runtime/NetworkManager.cs b/Assets/Mirror/Runtime/NetworkManager.cs
@@ -490,8 +490,6 @@ public void StopServer()
         /// </summary>
         public void StopClient()
         {
-            OnStopClient();
-
             if (LogFilter.Debug) Debug.Log("NetworkManager StopClient");
             isNetworkActive = false;
 
@@ -1274,11 +1272,6 @@ public virtual void OnClientSceneChanged(NetworkConnectionToServer conn)
         /// </summary>
         public virtual void OnStopServer() { }
 
-        /// <summary>
-        /// This is called when a client is stopped.
-        /// </summary>
-        public virtual void OnStopClient() { }
-
         /// <summary>
         /// This is called when a host is stopped.
         /// </summary>