Skip to content

chore: EntityId update for UnityTransport and MP Tools #3804

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 6 commits into from
Dec 2, 2025
Merged

chore: EntityId update for UnityTransport and MP Tools #3804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80b0c3c
update
NoelStephensUnity Dec 1, 2025
e761873
style
NoelStephensUnity Dec 1, 2025
3b1500f
update
NoelStephensUnity Dec 1, 2025
8c1b6fc
update
NoelStephensUnity Dec 1, 2025
0556a7a
style
NoelStephensUnity Dec 2, 2025
d4291f8
Merge branch 'develop-2.0.0' into chore/entityid-update-unitytranspor…
NoelStephensUnity Dec 2, 2025
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
32 changes: 6 additions & 26 deletions com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,18 +356,9 @@ private struct PacketLossCache
public float PacketLoss;
};

/// <summary>
/// TODO-FIXME:
/// Multiplayer Tools subscribes to this event and does not have the EntityId udpate.
/// </summary>
#if FIXED
#if UNITY_6000_2_OR_NEWER
internal static event Action<EntityId, NetworkDriver> TransportInitialized;
internal static event Action<EntityId> TransportDisposed;
#else
internal static event Action<int, NetworkDriver> TransportInitialized;
internal static event Action<int> TransportDisposed;
#endif
internal static event Action<EntityId, NetworkDriver> OnDriverInitialized;
internal static event Action<EntityId> OnDisposingDriver;
#endif
internal static event Action<int, NetworkDriver> TransportInitialized;
internal static event Action<int> TransportDisposed;
Expand Down Expand Up @@ -449,13 +440,8 @@ private void InitDriver()
out m_ReliableSequencedPipeline);
#if UNITY_6000_2_OR_NEWER
var entityId = GetEntityId();
#if UNITY_6000_3_0A6_OR_HIGHER
// TODO-FIXME: Since multiplayer tools subscribes to this and we have to validate against any package that
// might use this action, we have to cast it down temporarily to avoid being blocked from getting these fixes in place.
TransportInitialized?.Invoke((int)entityId.GetRawData(), m_Driver);
#else
TransportInitialized?.Invoke(entityId, m_Driver);
#endif
OnDriverInitialized?.Invoke(entityId, m_Driver);
TransportInitialized?.Invoke(entityId.GetHashCode(), m_Driver);
#else
TransportInitialized?.Invoke(GetInstanceID(), m_Driver);
#endif
Expand All @@ -477,14 +463,8 @@ private void DisposeInternals()

#if UNITY_6000_2_OR_NEWER
var entityId = GetEntityId();
#if UNITY_6000_3_0A6_OR_HIGHER
// TODO-FIXME: Since multiplayer tools subscribes to this and we have to validate against any package that
// might use this action, we have to cast it down temporarily to avoid being blocked from getting these fixes in place.
TransportDisposed?.Invoke((int)entityId.GetRawData());
#else
TransportDisposed?.Invoke(entityId, m_Driver);
#endif

OnDisposingDriver?.Invoke(entityId);
TransportDisposed?.Invoke(entityId.GetHashCode());
#else
TransportDisposed?.Invoke(GetInstanceID());
#endif
Expand Down
8 changes: 4 additions & 4 deletions com.unity.netcode.gameobjects/Runtime/Unity.Netcode.Runtime.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@
"define": "SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION"
},
{
"name": "Unity",
"expression": "6000.5.0a1",
"define": "SCENE_MANAGEMENT_SCENE_HANDLE_MUST_USE_ULONG"
"name": "Unity",
"expression": "6000.5.0a1",
"define": "SCENE_MANAGEMENT_SCENE_HANDLE_MUST_USE_ULONG"
}
],
"noEngineReferences": false
}
}