Merge 83fd6cbc20 into 03357f4275

.github/workflows/RunUnityTests.yml

@@ -16,7 +16,7 @@ jobs:
           - 2021.3.45f1
           - 2022.3.51f1
           - 2023.2.20f1
-          - 6000.0.25f1
+          - 6000.0.24f1
 
     steps:
       - name: Checkout repository

Assets/Mirror/Components/NetworkTransform/NetworkTransformHybrid.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8f63ea2e505fd484193fb31c5c55ca73
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Mirror/Core/Attributes.cs

@@ -48,28 +48,28 @@ public class TargetRpcAttribute : Attribute
     }
 
     /// <summary>
-    /// Only an active server will run this method.
-    /// <para>Prints a warning if a client or in-active server tries to execute this method.</para>
+    /// Prevents clients from running this method.
+    /// <para>Prints a warning if a client tries to execute this method.</para>
     /// </summary>
     [AttributeUsage(AttributeTargets.Method)]
     public class ServerAttribute : Attribute {}
 
     /// <summary>
-    /// Only an active server will run this method.
+    /// Prevents clients from running this method.
     /// <para>No warning is thrown.</para>
     /// </summary>
     [AttributeUsage(AttributeTargets.Method)]
     public class ServerCallbackAttribute : Attribute {}
 
     /// <summary>
-    /// Only an active client will run this method.
-    /// <para>Prints a warning if the server or in-active client tries to execute this method.</para>
+    /// Prevents the server from running this method.
+    /// <para>Prints a warning if the server tries to execute this method.</para>
     /// </summary>
     [AttributeUsage(AttributeTargets.Method)]
     public class ClientAttribute : Attribute {}
 
     /// <summary>
-    /// Only an active client will run this method.
+    /// Prevents the server from running this method.
     /// <para>No warning is printed.</para>
     /// </summary>
     [AttributeUsage(AttributeTargets.Method)]

Assets/Mirror/Core/NetworkIdentity.cs

@@ -709,25 +709,8 @@ void OnDestroy()
 
                 // if an identity is still in .spawned, remove it too.
                 // fixes: https://github.com/MirrorNetworking/Mirror/issues/3324
-                //
-                // however, verify that spawned[netId] is this NetworkIdentity
-                // fixes: https://github.com/MirrorNetworking/Mirror/issues/3785
-                // - server: netId=42 walks out of and back into AOI range in same frame
-                // - client frame 1:
-                //     on_destroymsg(42) -> NetworkClient.DestroyObject -> GameObject.Destroy(42) // next frame
-                //     on_spawnmsg(42) -> NetworkClient.SpawnPrefab -> Instantiate(42) -> spawned[42]=new_identity
-                // - client frame 2:
-                //     Unity destroys the old 42
-                //     NetworkIdentity.OnDestroy removes .spawned[42] which is new_identity not old_identity
-                //     new_identity becomes orphaned
-                //
-                // solution: only remove if spawned[netId] is this NetworkIdentity or null
-                if (NetworkClient.spawned.TryGetValue(netId, out NetworkIdentity entry))
-                {
-                    if (entry == this || entry == null)
                 NetworkClient.spawned.Remove(netId);
             }
-            }
 
             // workaround for cyclid NI<->NB reference causing memory leaks
             // after Destroy. [Credits: BigBoxVR/R.S.]
@@ -901,7 +884,7 @@ internal void OnStopLocalPlayer()
             for (int i = 0; i < components.Length; ++i)
             {
                 NetworkBehaviour component = components[i];
-                ulong nthBit = 1ul << i;
+                ulong nthBit = (1u << i);
 
                 bool dirty = component.IsDirty();
 
@@ -948,7 +931,7 @@ ulong ClientDirtyMask()
 
                 // on client, only consider owned components with SyncDirection to server
                 NetworkBehaviour component = components[i];
-                ulong nthBit = 1ul << i;
+                ulong nthBit = (1u << i);
 
                 if (isOwned && component.syncDirection == SyncDirection.ClientToServer)
                 {
@@ -966,7 +949,7 @@ ulong ClientDirtyMask()
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal static bool IsDirty(ulong mask, int index)
         {
-            ulong nthBit = 1ul << index;
+            ulong nthBit = (ulong)(1 << index);
             return (mask & nthBit) != 0;
         }
 

Assets/Mirror/Core/NetworkManager.cs

@@ -645,6 +645,31 @@ public void StopClient()
             NetworkClient.Disconnect();
         }
 
+        // called when quitting the application by closing the window / pressing
+        // stop in the editor. virtual so that inheriting classes'
+        // OnApplicationQuit() can call base.OnApplicationQuit() too
+        public virtual void OnApplicationQuit()
+        {
+            // stop client first
+            // (we want to send the quit packet to the server instead of waiting
+            //  for a timeout)
+            if (NetworkClient.isConnected)
+            {
+                StopClient();
+                //Debug.Log("OnApplicationQuit: stopped client");
+            }
+
+            // stop server after stopping client (for proper host mode stopping)
+            if (NetworkServer.active)
+            {
+                StopServer();
+                //Debug.Log("OnApplicationQuit: stopped server");
+            }
+
+            // Call ResetStatics to reset statics and singleton
+            ResetStatics();
+        }
+
         /// <summary>Set the frame rate for a headless builds. Override to disable or modify.</summary>
         // useful for dedicated servers.
         // useful for headless benchmark clients.
@@ -758,41 +783,12 @@ public static void ResetStatics()
             singleton = null;
         }
 
-        // called when quitting the application by closing the window / pressing
-        // stop in the editor.
-        // use OnDestroy instead of OnApplicationQuit:
-        // fixes: https://github.com/MirrorNetworking/Mirror/issues/2802
+        // virtual so that inheriting classes' OnDestroy() can call base.OnDestroy() too
         public virtual void OnDestroy()
         {
             //Debug.Log("NetworkManager destroyed");
-
-            // stop client first
-            // (we want to send the quit packet to the server instead of waiting
-            //  for a timeout)
-            if (NetworkClient.isConnected)
-            {
-                StopClient();
-                //Debug.Log("OnApplicationQuit: stopped client");
         }
 
-            // stop server after stopping client (for proper host mode stopping)
-            if (NetworkServer.active)
-            {
-                StopServer();
-                //Debug.Log("OnApplicationQuit: stopped server");
-            }
-
-            // Call ResetStatics to reset statics and singleton
-            ResetStatics();
-        }
-
-        // [Obsolete] in case someone is inheriting it.
-        // 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() {}
-
         /// <summary>The name of the current network scene.</summary>
         // set by NetworkManager when changing the scene.
         // new clients will automatically load this scene.

Assets/Mirror/Core/NetworkReaderExtensions.cs

@@ -313,6 +313,8 @@ public static List<T> ReadList<T>(this NetworkReader reader)
         // structs may have .Set<T> members which weaver needs to be able to
         // fully serialize for NetworkMessages etc.
         // note that Weaver/Readers/GenerateReader() handles this manually.
+        // TODO writer not found. need to adjust weaver first. see tests.
+        /*
         public static HashSet<T> ReadHashSet<T>(this NetworkReader reader)
         {
             // we offset count by '1' to easily support null without writing another byte.
@@ -332,6 +334,7 @@ public static HashSet<T> ReadHashSet<T>(this NetworkReader reader)
             }
             return result;
         }
+        */
 
         public static T[] ReadArray<T>(this NetworkReader reader)
         {

Assets/Mirror/Core/NetworkWriterExtensions.cs

@@ -365,25 +365,28 @@ public static void WriteList<T>(this NetworkWriter writer, List<T> list)
         // structs may have .Set<T> members which weaver needs to be able to
         // fully serialize for NetworkMessages etc.
         // note that Weaver/Writers/GenerateWriter() handles this manually.
-        public static void WriteHashSet<T>(this NetworkWriter writer, HashSet<T> hashSet)
-        {
-            // we offset count by '1' to easily support null without writing another byte.
-            // encoding null as '0' instead of '-1' also allows for better compression
-            // (ushort vs. short / varuint vs. varint) etc.
-            if (hashSet is null)
-            {
-                // most sizes are small, write size as VarUInt!
-                Compression.CompressVarUInt(writer, 0u);
-                //writer.WriteUInt(0);
-                return;
-            }
-
-            // most sizes are small, write size as VarUInt!
-            Compression.CompressVarUInt(writer, checked((uint)hashSet.Count) + 1u);
-            //writer.WriteUInt(checked((uint)hashSet.Count) + 1u);
-            foreach (T item in hashSet)
-                writer.Write(item);
-        }
+        // TODO writer not found. need to adjust weaver first. see tests.
+        // /*
+        // public static void WriteHashSet<T>(this NetworkWriter writer, HashSet<T> hashSet)
+        // {
+        //     // we offset count by '1' to easily support null without writing another byte.
+        //     // encoding null as '0' instead of '-1' also allows for better compression
+        //     // (ushort vs. short / varuint vs. varint) etc.
+        //     if (hashSet is null)
+        //     {
+        //         // most sizes are small, write size as VarUInt!
+        //         Compression.CompressVarUInt(writer, 0u);
+        //         //writer.WriteUInt(0);
+        //         return;
+        //     }
+        //
+        //     // most sizes are small, write size as VarUInt!
+        //     Compression.CompressVarUInt(writer, checked((uint)hashSet.Count) + 1u);
+        //     //writer.WriteUInt(checked((uint)hashSet.Count) + 1u);
+        //     foreach (T item in hashSet)
+        //         writer.Write(item);
+        // }
+        // */
 
         public static void WriteArray<T>(this NetworkWriter writer, T[] array)
         {

Assets/Mirror/Core/Tools/Extensions.cs

@@ -114,18 +114,6 @@ public static void SetPositionAndRotation(this Transform transform, Vector3 posi
             transform.position = position;
             transform.rotation = rotation;
         }
-
-        public static void GetLocalPositionAndRotation(this Transform transform, out Vector3 position, out Quaternion rotation)
-        {
-            position = transform.localPosition;
-            rotation = transform.localRotation;
-        }
-
-        public static void SetLocalPositionAndRotation(this Transform transform, Vector3 position, Quaternion rotation)
-        {
-            transform.localPosition = position;
-            transform.localRotation = rotation;
-        }
 #endif
 
         // IPEndPoint address only to pretty string.

Assets/Mirror/Core/Transport.cs

@@ -196,15 +196,8 @@ public virtual void ServerLateUpdate() {}
         /// <summary>Shut down the transport, both as client and server</summary>
         public abstract void Shutdown();
 
-        // [Obsolete] in case someone is inheriting it.
-        // 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
-        public virtual void OnDestroy()
+        /// <summary>Called by Unity when quitting. Inheriting Transports should call base for proper Shutdown.</summary>
+        public virtual void OnApplicationQuit()
         {
             // stop transport (e.g. to shut down threads)
             // (when pressing Stop in the Editor, Unity keeps threads alive

Assets/Mirror/Editor/Weaver/Readers.cs

@@ -125,13 +125,6 @@ MethodReference GenerateReader(TypeReference variableReference, ref bool Weaving
 
                 return GenerateReadCollection(variableReference, elementType, nameof(NetworkReaderExtensions.ReadList), ref WeavingFailed);
             }
-            else if (variableDefinition.Is(typeof(HashSet<>)))
-            {
-                GenericInstanceType genericInstance = (GenericInstanceType)variableReference;
-                TypeReference elementType = genericInstance.GenericArguments[0];
-
-                return GenerateReadCollection(variableReference, elementType, nameof(NetworkReaderExtensions.ReadHashSet), ref WeavingFailed);
-            }
             // handle both NetworkBehaviour and inheritors.
             // fixes: https://github.com/MirrorNetworking/Mirror/issues/2939
             else if (variableReference.IsDerivedFrom<NetworkBehaviour>() || variableReference.Is<NetworkBehaviour>())

Assets/Mirror/Editor/Weaver/Writers.cs

@@ -126,13 +126,6 @@ MethodReference GenerateWriter(TypeReference variableReference, ref bool Weaving
 
                 return GenerateCollectionWriter(variableReference, elementType, nameof(NetworkWriterExtensions.WriteList), ref WeavingFailed);
             }
-            if (variableReference.Is(typeof(HashSet<>)))
-            {
-                GenericInstanceType genericInstance = (GenericInstanceType)variableReference;
-                TypeReference elementType = genericInstance.GenericArguments[0];
-
-                return GenerateCollectionWriter(variableReference, elementType, nameof(NetworkWriterExtensions.WriteHashSet), ref WeavingFailed);
-            }
 
             // handle both NetworkBehaviour and inheritors.
             // fixes: https://github.com/MirrorNetworking/Mirror/issues/2939

Assets/Mirror/Examples/AutoLANClientController/Scripts/AutoLANNetworkManager.cs

@@ -62,6 +62,15 @@ public override void LateUpdate()
             base.LateUpdate();
         }
 
+        /// <summary>
+        /// Runs on both Server and Client
+        /// </summary>
+        public override void OnDestroy()
+        {
+            base.OnDestroy();
+            //UnityEngine.Debug.Log("OnDestroy");
+        }
+
 #endregion
 
         #region Start & Stop
@@ -78,10 +87,10 @@ public override void ConfigureHeadlessFrameRate()
         /// <summary>
         /// called when quitting the application by closing the window / pressing stop in the editor
         /// </summary>
-        public override void OnDestroy()
+        public override void OnApplicationQuit()
         {
-            base.OnDestroy();
-            //UnityEngine.Debug.Log("OnDestroy");
+            base.OnApplicationQuit();
+            //UnityEngine.Debug.Log("OnApplicationQuit");
         }
 
         #endregion

Assets/Mirror/Examples/PlayerTest/PlayerRBReliable.prefab

@@ -1,111 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &2505838817581327622
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8070823805368028938}
-  - component: {fileID: 9066655185906928051}
-  - component: {fileID: 4760233786622638652}
-  - component: {fileID: 2239866139065920034}
-  m_Layer: 0
-  m_Name: PlayerName
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8070823805368028938
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2505838817581327622}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 1.4999999, z: 0}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_Children: []
-  m_Father: {fileID: 5650773562400175449}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!23 &9066655185906928051
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2505838817581327622}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
---- !u!102 &4760233786622638652
-TextMesh:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2505838817581327622}
-  m_Text: RB Reliable
-  m_OffsetZ: 0
-  m_CharacterSize: 0.5
-  m_LineSpacing: 1
-  m_Anchor: 4
-  m_Alignment: 1
-  m_TabSize: 4
-  m_FontSize: 100
-  m_FontStyle: 0
-  m_RichText: 1
-  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-  m_Color:
-    serializedVersion: 2
-    rgba: 4294967040
---- !u!114 &2239866139065920034
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2505838817581327622}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: afa2d590c474413d9fc183551385ed85, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &3564599214188516024
 GameObject:
   m_ObjectHideFlags: 0
@@ -300,7 +194,6 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4320229852458648655}
-  - {fileID: 8070823805368028938}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Mirror/Examples/PlayerTest/PlayerRBUnreliable.prefab

@@ -1,111 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &1900176203039934355
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4129545300081926521}
-  - component: {fileID: 6572775962608386051}
-  - component: {fileID: 3912971638250293984}
-  - component: {fileID: 4630973873820678624}
-  m_Layer: 0
-  m_Name: PlayerName
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4129545300081926521
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1900176203039934355}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 1.4999999, z: 0}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_Children: []
-  m_Father: {fileID: 6814142693731383418}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!23 &6572775962608386051
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1900176203039934355}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
---- !u!102 &3912971638250293984
-TextMesh:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1900176203039934355}
-  m_Text: RB Unreliable
-  m_OffsetZ: 0
-  m_CharacterSize: 0.5
-  m_LineSpacing: 1
-  m_Anchor: 4
-  m_Alignment: 1
-  m_TabSize: 4
-  m_FontSize: 100
-  m_FontStyle: 0
-  m_RichText: 1
-  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-  m_Color:
-    serializedVersion: 2
-    rgba: 4278255615
---- !u!114 &4630973873820678624
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1900176203039934355}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: afa2d590c474413d9fc183551385ed85, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &2414815785185615771
 GameObject:
   m_ObjectHideFlags: 0
@@ -300,7 +194,6 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3102887894851733868}
-  - {fileID: 4129545300081926521}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Mirror/Examples/PlayerTest/PlayerReliable.prefab

@@ -79,112 +79,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!1 &5366675989284536270
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1545974004720046327}
-  - component: {fileID: 1128890847761595466}
-  - component: {fileID: 396193860522376263}
-  - component: {fileID: 6075803386746488465}
-  m_Layer: 0
-  m_Name: PlayerName
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1545974004720046327
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5366675989284536270}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 1.5, z: 0}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_Children: []
-  m_Father: {fileID: 4659514702152478195}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!23 &1128890847761595466
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5366675989284536270}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
---- !u!102 &396193860522376263
-TextMesh:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5366675989284536270}
-  m_Text: Reliable
-  m_OffsetZ: 0
-  m_CharacterSize: 0.5
-  m_LineSpacing: 1
-  m_Anchor: 4
-  m_Alignment: 1
-  m_TabSize: 4
-  m_FontSize: 100
-  m_FontStyle: 0
-  m_RichText: 1
-  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-  m_Color:
-    serializedVersion: 2
-    rgba: 4294967040
---- !u!114 &6075803386746488465
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5366675989284536270}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: afa2d590c474413d9fc183551385ed85, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &5844787331012650587
 GameObject:
   m_ObjectHideFlags: 0
@@ -301,7 +195,6 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3834521907656645861}
-  - {fileID: 1545974004720046327}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Mirror/Examples/PlayerTest/PlayerTestNetMan.cs

@@ -71,6 +71,14 @@ public override void 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
 
         #region Scene Management

Assets/Mirror/Examples/PlayerTest/PlayerUnreliable.prefab

@@ -159,112 +159,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!1 &7554601580530514207
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8679949096303753939}
-  - component: {fileID: 3142866354055383265}
-  - component: {fileID: 8297296856940116434}
-  - component: {fileID: 1123801447343694564}
-  m_Layer: 0
-  m_Name: PlayerName
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8679949096303753939
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7554601580530514207}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 1.4999999, z: 0}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_Children: []
-  m_Father: {fileID: 4659514702152478195}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!23 &3142866354055383265
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7554601580530514207}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
---- !u!102 &8297296856940116434
-TextMesh:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7554601580530514207}
-  m_Text: Unreliable
-  m_OffsetZ: 0
-  m_CharacterSize: 0.5
-  m_LineSpacing: 1
-  m_Anchor: 4
-  m_Alignment: 1
-  m_TabSize: 4
-  m_FontSize: 100
-  m_FontStyle: 0
-  m_RichText: 1
-  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-  m_Color:
-    serializedVersion: 2
-    rgba: 4278255615
---- !u!114 &1123801447343694564
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7554601580530514207}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: afa2d590c474413d9fc183551385ed85, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &7863680369626900553
 GameObject:
   m_ObjectHideFlags: 0
@@ -301,7 +195,6 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3834521907656645861}
-  - {fileID: 8679949096303753939}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Mirror/Examples/PlayerTest/TankReliable.prefab

@@ -38,7 +38,6 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 702109291309605218}
-  - {fileID: 1245118046271587945}
   - {fileID: 8174595063106582951}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -198,6 +197,7 @@ MonoBehaviour:
   maxTurnSpeed: 100
   turnAcceleration: 3
   runtimeData:
+    _horizontal: 0
     _vertical: 0
     _turnSpeed: 0
     _animVelocity: 0
@@ -328,112 +328,6 @@ MonoBehaviour:
   rotationSensitivity: 0.01
   positionPrecision: 0.01
   scalePrecision: 0.01
---- !u!1 &8370326626297540303
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1245118046271587945}
-  - component: {fileID: 2132579043257509693}
-  - component: {fileID: 7297775110981071875}
-  - component: {fileID: 755026988438523126}
-  m_Layer: 0
-  m_Name: PlayerName
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1245118046271587945
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8370326626297540303}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 4.5, z: 0}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_Children: []
-  m_Father: {fileID: 4659514702152478195}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!23 &2132579043257509693
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8370326626297540303}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
---- !u!102 &7297775110981071875
-TextMesh:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8370326626297540303}
-  m_Text: Reliable
-  m_OffsetZ: 0
-  m_CharacterSize: 0.5
-  m_LineSpacing: 1
-  m_Anchor: 4
-  m_Alignment: 1
-  m_TabSize: 4
-  m_FontSize: 100
-  m_FontStyle: 0
-  m_RichText: 1
-  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-  m_Color:
-    serializedVersion: 2
-    rgba: 4294967040
---- !u!114 &755026988438523126
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8370326626297540303}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: afa2d590c474413d9fc183551385ed85, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &9109672380512621037
 GameObject:
   m_ObjectHideFlags: 0
@@ -465,7 +359,7 @@ Transform:
   m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
   m_Children: []
   m_Father: {fileID: 4659514702152478195}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &4153780752967283830
 MeshRenderer:
@@ -552,11 +446,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: BasePrefab
       objectReference: {fileID: 0}
-    - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c,
         type: 3}
       propertyPath: m_LocalPosition.x

Assets/Mirror/Examples/PlayerTest/TankUnreliable.prefab

@@ -38,7 +38,6 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 702109291309605218}
-  - {fileID: 3980373565918037634}
   - {fileID: 8174595063106582951}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -198,6 +197,7 @@ MonoBehaviour:
   maxTurnSpeed: 100
   turnAcceleration: 3
   runtimeData:
+    _horizontal: 0
     _vertical: 0
     _turnSpeed: 0
     _animVelocity: 0
@@ -328,112 +328,6 @@ MonoBehaviour:
   positionSensitivity: 0.01
   rotationSensitivity: 0.01
   scaleSensitivity: 0.01
---- !u!1 &8921157218750951074
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3980373565918037634}
-  - component: {fileID: 6676747655999921495}
-  - component: {fileID: 2065557788844610204}
-  - component: {fileID: 7150452883383585942}
-  m_Layer: 0
-  m_Name: PlayerName
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3980373565918037634
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8921157218750951074}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 4.5, z: 0}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_Children: []
-  m_Father: {fileID: 4659514702152478195}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!23 &6676747655999921495
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8921157218750951074}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
---- !u!102 &2065557788844610204
-TextMesh:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8921157218750951074}
-  m_Text: Unreliable
-  m_OffsetZ: 0
-  m_CharacterSize: 0.5
-  m_LineSpacing: 1
-  m_Anchor: 4
-  m_Alignment: 1
-  m_TabSize: 4
-  m_FontSize: 100
-  m_FontStyle: 0
-  m_RichText: 1
-  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-  m_Color:
-    serializedVersion: 2
-    rgba: 4278255615
---- !u!114 &7150452883383585942
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8921157218750951074}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: afa2d590c474413d9fc183551385ed85, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &9109672380512621037
 GameObject:
   m_ObjectHideFlags: 0
@@ -465,7 +359,7 @@ Transform:
   m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
   m_Children: []
   m_Father: {fileID: 4659514702152478195}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &4153780752967283830
 MeshRenderer:
@@ -552,11 +446,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: BasePrefab
       objectReference: {fileID: 0}
-    - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c,
         type: 3}
       propertyPath: m_LocalPosition.x

Assets/Mirror/Examples/_Common/Scripts/PlayerCamera.cs

@@ -19,6 +19,11 @@ void Awake()
             mainCam = Camera.main;
         }
 
+        void OnDisable()
+        {
+            //Debug.Log("PlayerCamera.OnDisable");
+        }
+
         public override void OnStartLocalPlayer()
         {
             if (mainCam != null)
@@ -33,46 +38,16 @@ public override void OnStartLocalPlayer()
                 Debug.LogWarning("PlayerCamera: Could not find a camera in scene with 'MainCamera' tag.");
         }
 
-        void OnApplicationQuit()
-        {
-            //Debug.Log("PlayerCamera.OnApplicationQuit");
-            ReleaseCamera();
-        }
-
         public override void OnStopLocalPlayer()
-        {
-            //Debug.Log("PlayerCamera.OnStopLocalPlayer");
-            ReleaseCamera();
-        }
-
-        void OnDisable()
-        {
-            //Debug.Log("PlayerCamera.OnDisable");
-            ReleaseCamera();
-        }
-
-        void OnDestroy()
-        {
-            //Debug.Log("PlayerCamera.OnDestroy");
-            ReleaseCamera();
-        }
-
-        void ReleaseCamera()
         {
             if (mainCam != null && mainCam.transform.parent == transform)
             {
-                //Debug.Log("PlayerCamera.ReleaseCamera");
-
                 mainCam.transform.SetParent(null);
+                SceneManager.MoveGameObjectToScene(mainCam.gameObject, SceneManager.GetActiveScene());
                 mainCam.orthographic = true;
                 mainCam.orthographicSize = 15f;
                 mainCam.transform.localPosition = new Vector3(0f, 70f, 0f);
                 mainCam.transform.localEulerAngles = new Vector3(90f, 0f, 0f);
-
-                if (mainCam.gameObject.scene != SceneManager.GetActiveScene())
-                    SceneManager.MoveGameObjectToScene(mainCam.gameObject, SceneManager.GetActiveScene());
-
-                mainCam = null;
             }
         }
     }

Assets/Mirror/Tests/Common/MirrorTest.cs

@@ -1,5 +1,4 @@
 // base class for networking tests to make things easier.
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -82,18 +81,6 @@ protected void CreateNetworked(out GameObject go, out NetworkIdentity identity)
             instantiated.Add(go);
         }
 
-        protected void CreateNetworked(out GameObject go, out NetworkIdentity identity, Action<NetworkIdentity> preAwake)
-        {
-            go = new GameObject();
-            identity = go.AddComponent<NetworkIdentity>();
-            preAwake(identity);
-            // Awake is only called in play mode.
-            // call manually for initialization.
-            identity.Awake();
-            // track
-            instantiated.Add(go);
-        }
-
         // create GameObject + NetworkIdentity + NetworkBehaviour<T>
         // add to tracker list if needed (useful for cleanups afterwards)
         protected void CreateNetworked<T>(out GameObject go, out NetworkIdentity identity, out T component)
@@ -282,44 +269,6 @@ protected void CreateNetworkedAndSpawn(
             Assert.That(NetworkClient.spawned.ContainsKey(serverIdentity.netId));
         }
 
-        // create GameObject + NetworkIdentity + NetworkBehaviour & SPAWN
-        // => preAwake callbacks can be used to add network behaviours to the NI
-        // => ownerConnection can be NetworkServer.localConnection if needed.
-        // => returns objects from client and from server.
-        //    will be same in host mode.
-        protected void CreateNetworkedAndSpawn(
-            out GameObject serverGO, out NetworkIdentity serverIdentity, Action<NetworkIdentity> serverPreAwake,
-            out GameObject clientGO, out NetworkIdentity clientIdentity, Action<NetworkIdentity> clientPreAwake,
-            NetworkConnectionToClient ownerConnection = null)
-        {
-            // server & client need to be active before spawning
-            Debug.Assert(NetworkClient.active, "NetworkClient needs to be active before spawning.");
-            Debug.Assert(NetworkServer.active, "NetworkServer needs to be active before spawning.");
-
-            // create one on server, one on client
-            // (spawning has to find it on client, it doesn't create it)
-            CreateNetworked(out serverGO, out serverIdentity, serverPreAwake);
-            CreateNetworked(out clientGO, out clientIdentity, clientPreAwake);
-
-            // give both a scene id and register it on client for spawnables
-            clientIdentity.sceneId = serverIdentity.sceneId = (ulong)serverGO.GetHashCode();
-            NetworkClient.spawnableObjects[clientIdentity.sceneId] = clientIdentity;
-
-            // spawn
-            NetworkServer.Spawn(serverGO, ownerConnection);
-            ProcessMessages();
-
-            // double check isServer/isClient. avoids debugging headaches.
-            Assert.That(serverIdentity.isServer, Is.True);
-            Assert.That(clientIdentity.isClient, Is.True);
-
-            // double check that we have authority if we passed an owner connection
-            if (ownerConnection != null)
-                Debug.Assert(clientIdentity.isOwned == true, $"Behaviour Had Wrong Authority when spawned, This means that the test is broken and will give the wrong results");
-
-            // make sure the client really spawned it.
-            Assert.That(NetworkClient.spawned.ContainsKey(serverIdentity.netId));
-        }
         // create GameObject + NetworkIdentity + NetworkBehaviour & SPAWN
         // => ownerConnection can be NetworkServer.localConnection if needed.
         protected void CreateNetworkedAndSpawn<T>(out GameObject go, out NetworkIdentity identity, out T component, NetworkConnectionToClient ownerConnection = null)

Assets/Mirror/Tests/Editor/NetworkIdentity/NetworkIdentitySerializationTests.cs

@@ -1,5 +1,4 @@
 // OnDe/SerializeSafely tests.
-using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using Mirror.Tests.EditorBehaviours.NetworkIdentities;
 using NUnit.Framework;
@@ -70,123 +69,6 @@ public void SerializeAndDeserializeAll()
             Assert.That(clientObserversComp.value, Is.EqualTo(42)); // observers mode should be in data
         }
 
-        // test serialize -> deserialize of any supported number of components
-        [Test]
-        public void SerializeAndDeserializeN([NUnit.Framework.Range(1, 64)] int numberOfNBs)
-        {
-            List<SerializeTest1NetworkBehaviour> serverNBs = new List<SerializeTest1NetworkBehaviour>();
-            List<SerializeTest1NetworkBehaviour> clientNBs = new List<SerializeTest1NetworkBehaviour>();
-            // need two of both versions so we can serialize -> deserialize
-            CreateNetworkedAndSpawn(
-                out _, out NetworkIdentity serverIdentity, ni =>
-                {
-                    for (int i = 0; i < numberOfNBs; i++)
-                    {
-                        SerializeTest1NetworkBehaviour nb = ni.gameObject.AddComponent<SerializeTest1NetworkBehaviour>();
-                        nb.syncInterval = 0;
-                        nb.syncMode = SyncMode.Observers;
-                        serverNBs.Add(nb);
-                    }
-                },
-                out _, out NetworkIdentity clientIdentity, ni =>
-                {
-                    for (int i = 0; i < numberOfNBs; i++)
-                    {
-                        SerializeTest1NetworkBehaviour nb = ni.gameObject.AddComponent<SerializeTest1NetworkBehaviour>();
-                        nb.syncInterval = 0;
-                        nb.syncMode = SyncMode.Observers;
-                        clientNBs.Add(nb);
-                    }
-                }
-            );
-
-            // INITIAL SYNC
-            // set unique values on server components
-            for (int i = 0; i < serverNBs.Count; i++)
-            {
-                serverNBs[i].value = (i + 1) * 3;
-                serverNBs[i].SetDirty();
-            }
-
-            // serialize server object
-            serverIdentity.SerializeServer(true, ownerWriter, observersWriter);
-
-            // deserialize client object with OBSERVERS payload
-            NetworkReader reader = new NetworkReader(observersWriter.ToArray());
-            clientIdentity.DeserializeClient(reader, true);
-            for (int i = 0; i < clientNBs.Count; i++)
-            {
-                int expected = (i + 1) * 3;
-                Assert.That(clientNBs[i].value, Is.EqualTo(expected), $"Expected the clientNBs[{i}] to have a value of {expected}");
-            }
-
-            // clear dirty bits for incremental sync
-            foreach (SerializeTest1NetworkBehaviour serverNB in serverNBs)
-                serverNB.ClearAllDirtyBits();
-
-            // INCREMENTAL SYNC ALL
-            // set unique values on server components
-            for (int i = 0; i < serverNBs.Count; i++)
-            {
-                serverNBs[i].value = (i + 1) * 11;
-                serverNBs[i].SetDirty();
-            }
-
-            ownerWriter.Reset();
-            observersWriter.Reset();
-            // serialize server object
-            serverIdentity.SerializeServer(false, ownerWriter, observersWriter);
-
-            // deserialize client object with OBSERVERS payload
-            reader = new NetworkReader(observersWriter.ToArray());
-            clientIdentity.DeserializeClient(reader, false);
-            for (int i = 0; i < clientNBs.Count; i++)
-            {
-                int expected = (i + 1) * 11;
-                Assert.That(clientNBs[i].value, Is.EqualTo(expected), $"Expected the clientNBs[{i}] to have a value of {expected}");
-            }
-
-            // clear dirty bits for incremental sync
-            foreach (SerializeTest1NetworkBehaviour serverNB in serverNBs)
-                serverNB.ClearAllDirtyBits();
-
-            // INCREMENTAL SYNC INDIVIDUAL
-            for (int i = 0; i < numberOfNBs; i++)
-            {
-                // reset all client nbs
-                foreach (SerializeTest1NetworkBehaviour clientNB in clientNBs)
-                    clientNB.value = 0;
-
-                int expected = (i + 1) * 7;
-
-                // set unique value on server components
-                serverNBs[i].value = expected;
-                serverNBs[i].SetDirty();
-
-                ownerWriter.Reset();
-                observersWriter.Reset();
-                // serialize server object
-                serverIdentity.SerializeServer(false, ownerWriter, observersWriter);
-
-                // deserialize client object with OBSERVERS payload
-                reader = new NetworkReader(observersWriter.ToArray());
-                clientIdentity.DeserializeClient(reader, false);
-                for (int index = 0; index < clientNBs.Count; index++)
-                {
-                    SerializeTest1NetworkBehaviour clientNB = clientNBs[index];
-                    if (index == i)
-                    {
-                        Assert.That(clientNB.value, Is.EqualTo(expected), $"Expected the clientNBs[{index}] to have a value of {expected}");
-                    }
-                    else
-                    {
-                        Assert.That(clientNB.value, Is.EqualTo(0), $"Expected the clientNBs[{index}] to have a value of 0 since we're not syncing that index (on sync of #{i})");
-                    }
-                }
-            }
-        }
-
-
         // serialization should work even if a component throws an exception.
         // so if first component throws, second should still be serialized fine.
         [Test]

Assets/Mirror/Tests/Editor/NetworkReaderWriter/NetworkWriterTest.cs

@@ -1341,15 +1341,7 @@ public void TestNullList()
             Assert.That(readList, Is.Null);
         }
 
-        // writer.Write<T> for HashSet only works if it's actually used by weaver somewhere.
-        // so for TestHashSet() to pass, we need to pretend using a HashSet<int> somewhere.
-        class HashSetNetworkBehaviour : NetworkBehaviour
-        {
-            [Command]
-            public void CmdHashSet(HashSet<int> hashSet) {}
-        }
-
-        [Test] // requires HashSetNetworkBehaviour to exits!
+        [Test, Ignore("TODO")]
         public void TestHashSet()
         {
             HashSet<int> original = new HashSet<int>() { 1, 2, 3, 4, 5 };
@@ -1361,7 +1353,7 @@ public void TestHashSet()
             Assert.That(readHashSet, Is.EqualTo(original));
         }
 
-        [Test] // requires HashSetNetworkBehaviour to exits!
+        [Test, Ignore("TODO")]
         public void TestNullHashSet()
         {
             NetworkWriter writer = new NetworkWriter();

Assets/Mirror/Transports/Edgegap/EdgegapLobby/EdgegapLobbyKcpTransport.cs

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

Assets/Mirror/Transports/Threaded/ThreadedTransport.cs

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

Assets/ScriptTemplates/50-Mirror__Network Manager-NewNetworkManager.cs.txt

@@ -68,6 +68,14 @@ public class #SCRIPTNAME# : NetworkManager
         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
 
     #region Scene Management

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

@@ -15,6 +15,8 @@ public class #SCRIPTNAME# : NetworkManager
     public event Action OnStartAction;
     public event Action OnDestroyAction;
 
+    public event Action OnApplicationQuitAction;
+
     public event Action<string> ServerChangeSceneAction;
     public event Action<string> OnServerChangeSceneAction;
     public event Action<string> OnServerSceneChangedAction;
@@ -115,6 +117,15 @@ public class #SCRIPTNAME# : NetworkManager
         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
 
     #region Scene Management