Merge develop-2.0.0 into fix/3559/using-unreliable-deltas-should-disable-certain-features

netcode-ci-service · web-flow · commit 5c580ec6f5eb · 2026-02-09T21:20:35.000Z
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/Helpers/AttachableBehaviour.cs b/com.unity.netcode.gameobjects/Runtime/Components/Helpers/AttachableBehaviour.cs
@@ -282,7 +282,7 @@ public override void OnNetworkPreDespawn()
             {
                 ForceDetach();
             }
-            base.OnNetworkDespawn();
+            base.OnNetworkPreDespawn();
         }
 
         /// <summary>
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/OwnershipPermissionsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/OwnershipPermissionsTests.cs
@@ -659,7 +659,8 @@ public override void OnNetworkDespawn()
             {
                 NetworkObject.OnOwnershipRequested = null;
                 NetworkObject.OnOwnershipRequestResponse = null;
-                base.OnNetworkSpawn();
+                NetworkObject.OnOwnershipPermissionsFailure = null;
+                base.OnNetworkDespawn();
             }
 
             protected override void OnOwnershipChanged(ulong previous, ulong current)

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ public override void OnNetworkPreDespawn()`
`282`	`282`	`{`
`283`	`283`	`ForceDetach();`
`284`	`284`	`}`
`285`		`- base.OnNetworkDespawn();`
	`285`	`+ base.OnNetworkPreDespawn();`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,8 @@ public override void OnNetworkDespawn()`
`659`	`659`	`{`
`660`	`660`	`NetworkObject.OnOwnershipRequested = null;`
`661`	`661`	`NetworkObject.OnOwnershipRequestResponse = null;`
`662`		`- base.OnNetworkSpawn();`
	`662`	`+ NetworkObject.OnOwnershipPermissionsFailure = null;`
	`663`	`+ base.OnNetworkDespawn();`
`663`	`664`	`}`
`664`	`665`
`665`	`666`	`protected override void OnOwnershipChanged(ulong previous, ulong current)`