Revert "Merge branch 'develop' into fix/wrong-size-passed-to-unsafe-memset"

This reverts commit 65b089b, reversing
changes made to 9b58fe3.

Author: andrews-unity

com.unity.netcode.adapter.utp/CHANGELOG.md

@@ -10,7 +10,6 @@ All notable changes to this package will be documented in this file. The format
 ### Fixed
 
 - Fixed packet overflow errors when sending payloads too close to the MTU (was mostly visible when using Relay).
-- Don't throw an exception when the host disconnects (issue 1439 on GitHub).
 
 ## [1.0.0-pre.3] - 2021-10-22
 

com.unity.netcode.adapter.utp/Runtime/UnityTransport.cs

@@ -435,22 +435,20 @@ private bool ProcessEvent()
                     }
                 case TransportNetworkEvent.Type.Disconnect:
                     {
+                        InvokeOnTransportEvent(NetcodeNetworkEvent.Disconnect,
+                            ParseClientId(networkConnection),
+                            default(ArraySegment<byte>),
+                            Time.realtimeSinceStartup);
+
                         if (m_ServerConnection.IsCreated)
                         {
                             m_ServerConnection = default;
-
-                            var reason = reader.ReadByte();
-                            if (reason == (byte)Networking.Transport.Error.DisconnectReason.MaxConnectionAttempts)
+                            if (m_Driver.GetConnectionState(m_ServerConnection) == NetworkConnection.State.Connecting)
                             {
                                 Debug.LogError("Client failed to connect to server");
                             }
                         }
 
-                        InvokeOnTransportEvent(NetcodeNetworkEvent.Disconnect,
-                            ParseClientId(networkConnection),
-                            default(ArraySegment<byte>),
-                            Time.realtimeSinceStartup);
-
                         m_State = State.Disconnected;
                         return true;
                     }

com.unity.netcode.adapter.utp/Tests/Runtime/Helpers/RuntimeTestsHelpers.cs

@@ -10,13 +10,8 @@ public static class RuntimeTestsHelpers
     {
         // Half a second might seem like a very long time to wait for a network event, but in CI
         // many of the machines are underpowered (e.g. old Android devices or Macs) and there are
-        // sometimes very high lag spikes. PS4 and Switch are particularly sensitive in this regard
-        // so we allow even more time for these platforms.
-#if UNITY_PS4 || UNITY_SWITCH
-        public const float MaxNetworkEventWaitTime = 2.0f;
-#else
+        // sometimes lag spikes that cause can cause delays upwards of 300ms.
         public const float MaxNetworkEventWaitTime = 0.5f;
-#endif
 
         // Wait for an event to appear in the given event list (must be the very next event).
         public static IEnumerator WaitForNetworkEvent(NetworkEvent type, List<TransportEvent> events)

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -24,7 +24,6 @@ Additional documentation and release notes are available at [Multiplayer Documen
 - Fixed a runtime error when sending an array of an INetworkSerializable type that's implemented as a struct (#1402)
 - NetworkConfig will no longer throw an OverflowException in GetConfig() when ForceSamePrefabs is enabled and the number of prefabs causes the config blob size to exceed 1300 bytes. (#1385)
 - Fixed NetworkVariable not calling NetworkSerialize on INetworkSerializable types (#1383)
-- Fixed NullReferenceException on ImportReferences call in NetworkBehaviourILPP (#1434)
 
 - Fixed NetworkObjects not being despawned before they are destroyed during shutdown for client, host, and server instances. (#1390)
 - Fixed client player object being destroyed on server when the client's player object has DontDestroyWithOwner set. (#1433)

com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs

@@ -312,11 +312,7 @@ private bool ImportReferences(ModuleDefinition moduleDefinition)
             assemblies.Add(m_MainModule.Assembly);
             foreach (var reference in m_MainModule.AssemblyReferences)
             {
-                var assembly = m_AssemblyResolver.Resolve(reference);
-                if (assembly != null)
-                {
-                    assemblies.Add(assembly);
-                }
+                assemblies.Add(m_AssemblyResolver.Resolve(reference));
             }
 
             var extensionConstructor =