Skip to content

fix: Clear cached parent when AutoObjectParentSync is false. #4030

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

Draft
EmandM wants to merge 1 commit into
base: develop-2.0.0
Choose a base branch
from
+13 −2
Draft

fix: Clear cached parent when AutoObjectParentSync is false. #4030

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2368,11 +2368,22 @@ internal bool InternalTrySetParent(NetworkObject parent, bool worldPositionStays
private void OnTransformParentChanged()
{
var networkManager = NetworkManager;
if (!AutoObjectParentSync || (networkManager != null && networkManager.ShutdownInProgress))
if (networkManager != null && networkManager.ShutdownInProgress)
{
return;
}

if (!AutoObjectParentSync)
{
// If this setting is off, we shouldn't be tracking parenting changes
// Ensure any tracking we do have is cleared.
if (m_CachedParent != null)
{
SetCachedParent(null);
}
return;
}

if (transform.parent == m_CachedParent)
{
return;
Expand All @@ -2388,7 +2399,6 @@ private void OnTransformParentChanged()

if (!IsSpawned)
{
AuthorityAppliedParenting = false;
// and we are removing the parent, then go ahead and allow parenting to occur
if (transform.parent == null)
{
Expand All @@ -2398,6 +2408,7 @@ private void OnTransformParentChanged()
}
else
{
AuthorityAppliedParenting = false;
transform.parent = m_CachedParent;
if (networkManager.LogLevel <= LogLevel.Error)
{
Expand Down