Skip to content

Commit 1f7e70c

Browse files
update
Adding sort by identifier to two locations that require sorting by identifier.
1 parent b52e907 commit 1f7e70c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,7 @@ internal void DespawnObject(NetworkObject networkObject, bool destroyObject = fa
13691369
// Makes scene objects ready to be reused
13701370
internal void ServerResetShudownStateForSceneObjects()
13711371
{
1372-
var networkObjects = FindObjects.ByType<NetworkObject>().Where((c) => c.IsSceneObject != null && c.IsSceneObject == true);
1372+
var networkObjects = FindObjects.ByType<NetworkObject>(orderByIdentifier: true).Where((c) => c.IsSceneObject != null && c.IsSceneObject == true);
13731373
foreach (var sobj in networkObjects)
13741374
{
13751375
sobj.IsSpawned = false;
@@ -1400,7 +1400,7 @@ internal void ServerDestroySpawnedSceneObjects()
14001400

14011401
internal void DespawnAndDestroyNetworkObjects()
14021402
{
1403-
var networkObjects = FindObjects.ByType<NetworkObject>();
1403+
var networkObjects = FindObjects.ByType<NetworkObject>(orderByIdentifier:true);
14041404

14051405
foreach (var networkObject in networkObjects)
14061406
{

com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectNetworkClientOwnedObjectsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public IEnumerator WhenOwnershipIsChanged_OwnershipValuesUpdateCorrectly()
7575
Assert.IsFalse(serverBehaviour.IsOwnedByServer);
7676
Assert.AreEqual(m_ClientNetworkManagers[0].LocalClientId, serverBehaviour.OwnerClientId);
7777

78-
var clientObject = FindObjects.ByType<NetworkObject>().Where((obj) => obj.NetworkManagerOwner == m_ClientNetworkManagers[0]).FirstOrDefault();
78+
var clientObject = FindObjects.ByType<NetworkObject>(orderByIdentifier: true).Where((obj) => obj.NetworkManagerOwner == m_ClientNetworkManagers[0]).FirstOrDefault();
7979

8080
Assert.IsNotNull(clientObject);
8181
Assert.IsTrue(clientObject.IsOwner);

0 commit comments

Comments
 (0)