Skip to content

Commit

Permalink
Merge branch 'develop' into fix/anticipatednetworkvariable-not-updati…
Browse files Browse the repository at this point in the history
…ng-previousvalue-back-port
  • Loading branch information
NoelStephensUnity authored Feb 25, 2025
2 parents 32fbd27 + 3b63bdf commit 90106c0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .yamato/_triggers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ develop_nightly:
dependencies:
# Run project standards to verify package/default project
- .yamato/project-standards.yml#standards_ubuntu_testproject_trunk
# - .yamato/project-standards.yml#standards_ubuntu_testproject_2021.3 # Tracked in MTT-11382
- .yamato/project-standards.yml#standards_ubuntu_testproject_2021.3
# Run APV jobs to make sure the change won't break any dependants
- .yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs
# Run package EditMode and Playmode tests on desktop platforms on trunk and 2021.3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1241,16 +1241,16 @@ public NetworkEndpoint GetEndpoint(ulong clientId)
}
#else
/// <summary>
/// Provides the <see cref="NetworkEndPoint"/> for the NGO client identifier specified.
/// Provides the <see cref="NetworkEndpoint"/> for the NGO client identifier specified.
/// </summary>
/// <remarks>
/// - This is only really useful for direct connections.
/// - Relay connections and clients connected using a distributed authority network topology will not provide the client's actual endpoint information.
/// - For LAN topologies this should work as long as it is a direct connection and not a relay connection.
/// </remarks>
/// <param name="clientId">NGO client identifier to get endpoint information about.</param>
/// <returns><see cref="NetworkEndPoint"/></returns>
public NetworkEndPoint GetEndpoint(ulong clientId)
/// <returns><see cref="NetworkEndpoint"/></returns>
public NetworkEndpoint GetEndpoint(ulong clientId)
{
if (m_Driver.IsCreated && NetworkManager != null && NetworkManager.IsListening)
{
Expand All @@ -1261,7 +1261,7 @@ public NetworkEndPoint GetEndpoint(ulong clientId)
return m_Driver.RemoteEndPoint(networkConnection);
}
}
return new NetworkEndPoint();
return new NetworkEndpoint();
}
#endif

Expand Down

0 comments on commit 90106c0

Please sign in to comment.