Skip to content

fix: GlobalObjectIdHash Generation (missed changes) #2721

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
merged 3 commits into from
Oct 3, 2023
Merged

fix: GlobalObjectIdHash Generation (missed changes) #2721

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96ad442
update
NoelStephensUnity Oct 2, 2023
17d63a3
update
NoelStephensUnity Oct 2, 2023
615c4d0
Merge branch 'develop' into fix/globalobjectidhash-generation-pre-ser…
NoelStephensUnity Oct 3, 2023
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
8 changes: 1 addition & 7 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 @@ -51,6 +51,7 @@ public uint PrefabIdHash

/// <summary>
/// Object Types <see href="https://docs.unity3d.com/ScriptReference/GlobalObjectId.html"/>
/// Parameter 0 of <see cref="k_GlobalIdTemplate"/>
/// </summary>
// 0 = Null (when considered a null object type we can ignore)
// 1 = Imported Asset
Expand Down Expand Up @@ -97,11 +98,6 @@ internal void RefreshAllPrefabInstances()
}

private void OnValidate()
{
GenerateGlobalObjectIdHash();
}

internal void GenerateGlobalObjectIdHash()
{
// do NOT regenerate GlobalObjectIdHash for NetworkPrefabs while Editor is in PlayMode
if (EditorApplication.isPlaying && !string.IsNullOrEmpty(gameObject.scene.name))
Expand Down Expand Up @@ -147,8 +143,6 @@ internal void GenerateGlobalObjectIdHash()
// We must invoke this in order for the modifications to get saved with the scene (does not mark scene as dirty)
PrefabUtility.RecordPrefabInstancePropertyModifications(this);
}

NetworkObjectRefreshTool.ProcessScene(gameObject.scene.path);
}
else // Otherwise, this is a standard network prefab asset so we just mark it dirty for the AssetDatabase to update it
{
Expand Down