Skip to content

fix: attachable despawn vs detach order & ownership test. #3895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NoelStephensUnity merged 4 commits into from
Mar 12, 2026
Merged

fix: attachable despawn vs detach order & ownership test. #3895

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd7173a
fix
NoelStephensUnity Mar 11, 2026
00ff180
update
NoelStephensUnity Mar 11, 2026
4872b85
Merge branch 'develop-2.0.0' into fix/attachable-and-ownership-adjust…
NoelStephensUnity Mar 12, 2026
21146a4
Merge branch 'develop-2.0.0' into fix/attachable-and-ownership-adjust…
NoelStephensUnity Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions com.unity.netcode.gameobjects/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Additional documentation and release notes are available at [Multiplayer Documen

### Fixed

- Fixed issue where an attachable could log an error upon being de-spawned during shutdown. (#3895)

### Security

Expand Down
5 changes: 3 additions & 2 deletions com.unity.netcode.gameobjects/Runtime/Components/Helpers/AttachableBehaviour.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ internal void ForceDetach()
/// <inheritdoc/>
public override void OnNetworkPreDespawn()
{
if (AutoDetach.HasFlag(AutoDetachTypes.OnDespawn))
if (NetworkManager.ShutdownInProgress || AutoDetach.HasFlag(AutoDetachTypes.OnDespawn))
{
ForceDetach();
}
Expand Down Expand Up @@ -474,10 +474,11 @@ internal void InternalDetach()
/// </summary>
public void Detach()
{
if (!gameObject)
if (!gameObject || NetworkObject == null || NetworkManager == null || NetworkManager.ShutdownInProgress)
{
return;
}

if (!IsSpawned)
{
NetworkLog.LogError($"[{name}][Detach][Not Spawned] Cannot detach if not spawned!");
Expand Down
2 changes: 1 addition & 1 deletion ...de.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectNetworkClientOwnedObjectsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public IEnumerator WhenOwnershipIsChanged_OwnershipValuesUpdateCorrectly()
Assert.IsFalse(serverBehaviour.IsOwnedByServer);
Assert.AreEqual(m_ClientNetworkManagers[0].LocalClientId, serverBehaviour.OwnerClientId);

var clientObject = FindObjects.ByType<NetworkObject>(orderByIdentifier: true).Where((obj) => obj.NetworkManagerOwner == m_ClientNetworkManagers[0]).FirstOrDefault();
var clientObject = m_ClientNetworkManagers[0].SpawnManager.SpawnedObjects.ContainsKey(serverObject.NetworkObjectId) ? m_ClientNetworkManagers[0].SpawnManager.SpawnedObjects[serverObject.NetworkObjectId] : null;

Assert.IsNotNull(clientObject);
Assert.IsTrue(clientObject.IsOwner);
Expand Down