Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Unity.Netcode
/// specific to the N4E-spawned hybrid prefab instance that has the matching <see cref="NetworkObjectId"/>.
/// </summary>

[DefaultExecutionOrder(GhostObjectExecutionOrder.ExecutionOrder + 1)]
[DefaultExecutionOrder(GhostObject.ExecutionOrder + 1)]
//BREAK --- Fix this on UNIFIED side 1st
public partial class NetworkObjectBridge : GhostBehaviour
{
Expand Down Expand Up @@ -61,11 +61,6 @@ private void OnValidate()
/// N4E-spawned hybrid prefab instances.
/// </summary>
internal GhostField<ulong> NetworkObjectId = new GhostField<ulong>();
public void SetNetworkObjectId(ulong networkObjectId)
{
NetworkObjectId.PresetValue(networkObjectId);
NetworkObjectId.Value = networkObjectId;
}

/// <summary>
/// Currently, NGO provides the parenting event handling via <see cref="ParentSyncMessage"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,7 @@ internal bool AuthorityLocalSpawn([NotNull] NetworkObject networkObject, ulong n
// the NetworkObject is fully spawned.
if (networkObject.HasGhost)
{
networkObject.NetworkObjectBridge.SetNetworkObjectId(networkObject.NetworkObjectId);
networkObject.NetworkObjectBridge.NetworkObjectId.Value = networkObject.NetworkObjectId;
}
#endif

Expand Down