charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-17 18:40:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Cleanup after PR #3935

Browse Source
This commit is contained in:
MrGadget 2024-10-29 10:46:43 -04:00
parent af133e6110
commit f61524863e
6 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Mirror/Core/NetworkManager.cs
View File

@ -779,7 +779,7 @@ public virtual void OnDestroy()
// don't use this anymore. // don't use this anymore.
// fixes: https://github.com/MirrorNetworking/Mirror/issues/2802 // fixes: https://github.com/MirrorNetworking/Mirror/issues/2802
// DEPRECATED 2024-10-29 // DEPRECATED 2024-10-29
[Obsolete("Override OnDestroy instead of OnApplicationQuit. Fixes: https://github.com/MirrorNetworking/Mirror/issues/2802")] [Obsolete("Override OnDestroy instead of OnApplicationQuit.")]
public virtual void OnApplicationQuit() {} public virtual void OnApplicationQuit() {}
/// <summary>The name of the current network scene.</summary> /// <summary>The name of the current network scene.</summary>

9
Assets/Mirror/Core/Transport.cs
View File

@ -196,8 +196,13 @@ public virtual void ServerLateUpdate() {}
/// <summary>Shut down the transport, both as client and server</summary> /// <summary>Shut down the transport, both as client and server</summary>
public abstract void Shutdown(); public abstract void Shutdown();
/// <summary>Called by Unity when quitting. Inheriting Transports should call base for proper Shutdown.</summary> // [Obsolete] in case someone is inheriting it.
// use OnDestroy instead of OnApplicationQuit: // don't use this anymore.
// fixes: https://github.com/MirrorNetworking/Mirror/issues/2802
// DEPRECATED 2024-10-29
[Obsolete("Override OnDestroy instead of OnApplicationQuit.")]
public virtual void OnApplicationQuit() {}
// fixes: https://github.com/MirrorNetworking/Mirror/issues/2802 // fixes: https://github.com/MirrorNetworking/Mirror/issues/2802
public virtual void OnDestroy() public virtual void OnDestroy()
{ {

4
Assets/Mirror/Transports/Edgegap/EdgegapLobby/EdgegapLobbyKcpTransport.cs
View File

@ -323,7 +323,7 @@ public void SetServerLobbyParams(LobbyCreateRequest request)
_request = request; _request = request;
} }
private void OnDestroy() public override void OnDestroy()
{ {
// attempt to clean up lobbies, if active // attempt to clean up lobbies, if active
if (NetworkServer.active) if (NetworkServer.active)
@ -340,6 +340,8 @@ private void OnDestroy()
// sorry. this can go once the lobby service can timeout lobbies itself // sorry. this can go once the lobby service can timeout lobbies itself
Thread.Sleep(300); Thread.Sleep(300);
} }
base.OnDestroy();
} }
} }
} }

5
Assets/Mirror/Transports/Threaded/ThreadedTransport.cs
View File

@ -197,11 +197,10 @@ void EnsureThread()
Debug.Log($"ThreadedTransport: started worker thread!"); Debug.Log($"ThreadedTransport: started worker thread!");
} }
protected virtual void OnDestroy() public override void OnDestroy()
{ {
// stop thread fully // stop thread fully
Shutdown(); base.OnDestroy();
// TODO recycle writers. // TODO recycle writers.
} }

8
Assets/ScriptTemplates/50-Mirror__Network Manager-NewNetworkManager.cs.txt
View File

@ -68,14 +68,6 @@ public class #SCRIPTNAME# : NetworkManager
base.ConfigureHeadlessFrameRate(); base.ConfigureHeadlessFrameRate();
} }
/// <summary>
/// called when quitting the application by closing the window / pressing stop in the editor
/// </summary>
public override void OnApplicationQuit()
{
base.OnApplicationQuit();
}
#endregion #endregion
#region Scene Management #region Scene Management

11
Assets/ScriptTemplates/51-Mirror__Network Manager With Actions-NewNetworkManagerWithActions.cs.txt
View File

@ -15,8 +15,6 @@ public class #SCRIPTNAME# : NetworkManager
public event Action OnStartAction; public event Action OnStartAction;
public event Action OnDestroyAction; public event Action OnDestroyAction;
public event Action OnApplicationQuitAction;
public event Action<string> ServerChangeSceneAction; public event Action<string> ServerChangeSceneAction;
public event Action<string> OnServerChangeSceneAction; public event Action<string> OnServerChangeSceneAction;
public event Action<string> OnServerSceneChangedAction; public event Action<string> OnServerSceneChangedAction;
@ -117,15 +115,6 @@ public class #SCRIPTNAME# : NetworkManager
base.ConfigureHeadlessFrameRate(); base.ConfigureHeadlessFrameRate();
} }
/// <summary>
/// called when quitting the application by closing the window / pressing stop in the editor
/// </summary>
public override void OnApplicationQuit()
{
OnApplicationQuitAction?.Invoke();
base.OnApplicationQuit();
}
#endregion #endregion
#region Scene Management #region Scene Management