Update com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs

NoelStephensUnity · EmandM · web-flow · commit 5662003a0aa4 · 2025-07-30T15:15:41.000-05:00
Co-authored-by: Emma &lt;emma.mcmillan@unity3d.com&gt;
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs
@@ -218,7 +218,7 @@ private static void CheckPrefabStage(PrefabStage prefabStage)
                     s_PrefabAsset = AssetDatabase.LoadAssetAtPath<NetworkObject>(s_PrefabStage.assetPath);
                 }
 
-                if (s_PrefabAsset && s_PrefabInstance && s_PrefabInstance.GlobalObjectIdHash != s_PrefabAsset.GlobalObjectIdHash)
+                if (s_PrefabAsset && s_PrefabInstance.GlobalObjectIdHash != s_PrefabAsset.GlobalObjectIdHash)
                 {
                     s_PrefabInstance.GlobalObjectIdHash = s_PrefabAsset.GlobalObjectIdHash;
                     // For InContext mode, we don't want to record these modifications (the in-scene GlobalObjectIdHash is serialized with the scene).

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ private static void CheckPrefabStage(PrefabStage prefabStage)`
`218`	`218`	`s_PrefabAsset = AssetDatabase.LoadAssetAtPath<NetworkObject>(s_PrefabStage.assetPath);`
`219`	`219`	`}`
`220`	`220`
`221`		`- if (s_PrefabAsset && s_PrefabInstance && s_PrefabInstance.GlobalObjectIdHash != s_PrefabAsset.GlobalObjectIdHash)`
	`221`	`+ if (s_PrefabAsset && s_PrefabInstance.GlobalObjectIdHash != s_PrefabAsset.GlobalObjectIdHash)`
`222`	`222`	`{`
`223`	`223`	`s_PrefabInstance.GlobalObjectIdHash = s_PrefabAsset.GlobalObjectIdHash;`
`224`	`224`	`// For InContext mode, we don't want to record these modifications (the in-scene GlobalObjectIdHash is serialized with the scene).`