Use the singleton instead

simon-lemay-unity · simon-lemay-unity · commit 87da13fb4bc9 · 2026-07-07T10:57:17.000-04:00
diff --git a/com.unity.netcode.gameobjects/Editor/NetworkManagerHelper.cs b/com.unity.netcode.gameobjects/Editor/NetworkManagerHelper.cs
@@ -63,11 +63,7 @@ private static void AssemblyReloadEvents_beforeAssemblyReload()
         {
             if (Application.isPlaying)
             {
-#if UNITY_2023_1_OR_NEWER
-                var networkManager = Object.FindAnyObjectByType<NetworkManager>();
-#else
-                var networkManager = Object.FindObjectOfType<NetworkManager>();
-#endif
+                var networkManager = NetworkManager.Singleton;
                 if (networkManager != null && (networkManager.IsServer || networkManager.IsClient))
                 {
                     networkManager.Shutdown();

Original file line number	Diff line number	Diff line change
`@@ -63,11 +63,7 @@ private static void AssemblyReloadEvents_beforeAssemblyReload()`
`63`	`63`	`{`
`64`	`64`	`if (Application.isPlaying)`
`65`	`65`	`{`
`66`		`-#if UNITY_2023_1_OR_NEWER`
`67`		`- var networkManager = Object.FindAnyObjectByType<NetworkManager>();`
`68`		`-#else`
`69`		`- var networkManager = Object.FindObjectOfType<NetworkManager>();`
`70`		`-#endif`
	`66`	`+ var networkManager = NetworkManager.Singleton;`
`71`	`67`	`if (networkManager != null && (networkManager.IsServer \|\| networkManager.IsClient))`
`72`	`68`	`{`
`73`	`69`	`networkManager.Shutdown();`