Skip to content

Commit a103e49

Browse files
committed
Cleaning diff
1 parent 4005c50 commit a103e49

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -807,22 +807,22 @@ internal NetworkObject GetNetworkObjectToSpawn(uint globalObjectIdHash, ulong ow
807807
break;
808808
case NetworkPrefabOverride.Hash:
809809
case NetworkPrefabOverride.Prefab:
810-
{
811-
// When scene management is disabled and this is an in-scene placed NetworkObject, we want to always use the
812-
// SourcePrefabToOverride and not any possible prefab override as a user might want to spawn overrides dynamically
813-
// but might want to use the same source network prefab as an in-scene placed NetworkObject.
814-
// (When scene management is enabled, clients don't delete their in-scene placed NetworkObjects prior to dynamically
815-
// spawning them so the original prefab placed is preserved and this is not needed)
816-
if (inScenePlacedWithNoSceneManagement)
817-
{
818-
networkPrefabReference = networkPrefab.SourcePrefabToOverride ? networkPrefab.SourcePrefabToOverride : networkPrefab.Prefab;
819-
}
820-
else
821810
{
822-
networkPrefabReference = NetworkManager.NetworkConfig.Prefabs.NetworkPrefabOverrideLinks[globalObjectIdHash].OverridingTargetPrefab;
811+
// When scene management is disabled and this is an in-scene placed NetworkObject, we want to always use the
812+
// SourcePrefabToOverride and not any possible prefab override as a user might want to spawn overrides dynamically
813+
// but might want to use the same source network prefab as an in-scene placed NetworkObject.
814+
// (When scene management is enabled, clients don't delete their in-scene placed NetworkObjects prior to dynamically
815+
// spawning them so the original prefab placed is preserved and this is not needed)
816+
if (inScenePlacedWithNoSceneManagement)
817+
{
818+
networkPrefabReference = networkPrefab.SourcePrefabToOverride ? networkPrefab.SourcePrefabToOverride : networkPrefab.Prefab;
819+
}
820+
else
821+
{
822+
networkPrefabReference = NetworkManager.NetworkConfig.Prefabs.NetworkPrefabOverrideLinks[globalObjectIdHash].OverridingTargetPrefab;
823+
}
824+
break;
823825
}
824-
break;
825-
}
826826
}
827827
}
828828

0 commit comments

Comments
 (0)