Small fixes

Author: noellie-velez

com.unity.netcode.gameobjects/Runtime/Components/RigidbodyContactEventManager.cs

@@ -109,7 +109,7 @@ private void OnEnable()
         {
             m_ResultsArray = new NativeArray<JobResultStruct>(16, Allocator.Persistent);
             Physics.ContactEvent += Physics_ContactEvent;
-            if (Instance != null || Instance != this)
+            if (Instance != null && Instance != this)
             {
                 NetworkLog.LogError($"[Invalid][Multiple Instances] Found more than one instance of {nameof(RigidbodyContactEventManager)}: {name} and {Instance.name}");
                 NetworkLog.LogError($"[Disable][Additional Instance] Disabling {name} instance!");

com.unity.netcode.gameobjects/Runtime/Configuration/CommandLineOptions.cs

@@ -18,14 +18,14 @@ public class CommandLineOptions
         // Contains the current application instance domain's command line arguments
         private static List<string> s_CommandLineArguments = new List<string>(Environment.GetCommandLineArgs());
 
-#if UNITY_EDITOR
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
-        private static void ResetStaticsOnLoad()
+        private static void InitializeOnLoad()
         {
             Instance = new CommandLineOptions();
+#if UNITY_EDITOR
             s_CommandLineArguments = new List<string>(Environment.GetCommandLineArgs());
-        }
 #endif
+        }
 
         /// <summary>
         /// Returns the value of an argument or null if the argument is not present

com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs

@@ -1581,8 +1581,9 @@ public SceneEventProgressStatus LoadScene(string sceneName, LoadSceneMode loadSc
         internal class SceneUnloadEventHandler
         {
             private static Dictionary<NetworkManager, List<SceneUnloadEventHandler>> s_Instances = new Dictionary<NetworkManager, List<SceneUnloadEventHandler>>();
-            [Conditional("UNITY_EDITOR")]
+#if UNITY_EDITOR
             internal static void ResetInstances() => s_Instances = new Dictionary<NetworkManager, List<SceneUnloadEventHandler>>();
+#endif
 
             internal static void RegisterScene(NetworkSceneManager networkSceneManager, Scene scene, LoadSceneMode loadSceneMode, AsyncOperation asyncOperation = null)
             {

com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventData.cs

@@ -133,7 +133,6 @@ internal class SceneEventData : IDisposable
         private List<NetworkObject> m_NetworkObjectsSync = new List<NetworkObject>();
 
         private List<NetworkObject> m_DespawnedInSceneObjectsSync = new List<NetworkObject>();
-        private Dictionary<int, List<uint>> m_DespawnedInSceneObjects = new Dictionary<int, List<uint>>();
 
         /// <summary>
         /// Server Side Re-Synchronization:
@@ -1005,7 +1004,6 @@ internal void WriteClientSynchronizationResults(FastBufferWriter writer)
         private void DeserializeDespawnedInScenePlacedNetworkObjects()
         {
             // Process all de-spawned in-scene NetworkObjects for this network session
-            m_DespawnedInSceneObjects.Clear();
             InternalBuffer.ReadValueSafe(out int despawnedObjectsCount);
             var sceneCache = new Dictionary<NetworkSceneHandle, Dictionary<uint, NetworkObject>>();