Skip to content

Commit 122c593

Browse files
committed
Use local network manager instead of field
+ Add comments
1 parent 1495955 commit 122c593

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ internal FastBufferWriter __beginSendServerRpc(uint rpcMethodId, ServerRpcParams
9090
internal void __endSendServerRpc(ref FastBufferWriter bufferWriter, uint rpcMethodId, ServerRpcParams serverRpcParams, RpcDelivery rpcDelivery)
9191
#pragma warning restore IDE1006 // restore naming rule violation check
9292
{
93+
// Getting this ahead of time actually improves performance
9394
var networkManager = m_NetworkManager;
9495
var serverRpcMessage = new ServerRpcMessage
9596
{
@@ -169,6 +170,7 @@ internal FastBufferWriter __beginSendClientRpc(uint rpcMethodId, ClientRpcParams
169170
internal void __endSendClientRpc(ref FastBufferWriter bufferWriter, uint rpcMethodId, ClientRpcParams clientRpcParams, RpcDelivery rpcDelivery)
170171
#pragma warning restore IDE1006 // restore naming rule violation check
171172
{
173+
// Getting this ahead of time actually improves performance
172174
var networkManager = m_NetworkManager;
173175
var clientRpcMessage = new ClientRpcMessage
174176
{
@@ -206,7 +208,7 @@ internal void __endSendClientRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
206208
{
207209
foreach (var targetClientId in clientRpcParams.Send.TargetClientIds)
208210
{
209-
if (targetClientId == NetworkManager.ServerClientId)
211+
if (targetClientId == networkManager.ServerClientId)
210212
{
211213
shouldInvokeLocally = true;
212214
continue;
@@ -217,13 +219,13 @@ internal void __endSendClientRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
217219
NetworkLog.LogError(GenerateObserverErrorMessage(clientRpcParams, targetClientId));
218220
}
219221
}
220-
rpcWriteSize = m_NetworkManager.ConnectionManager.SendMessage(ref clientRpcMessage, networkDelivery, in clientRpcParams.Send.TargetClientIds);
222+
rpcWriteSize = networkManager.ConnectionManager.SendMessage(ref clientRpcMessage, networkDelivery, in clientRpcParams.Send.TargetClientIds);
221223
}
222224
else if (clientRpcParams.Send.TargetClientIdsNativeArray != null)
223225
{
224226
foreach (var targetClientId in clientRpcParams.Send.TargetClientIdsNativeArray)
225227
{
226-
if (targetClientId == NetworkManager.ServerClientId)
228+
if (targetClientId == networkManager.ServerClientId)
227229
{
228230
shouldInvokeLocally = true;
229231
continue;
@@ -652,6 +654,7 @@ protected NetworkBehaviour GetNetworkBehaviour(ushort behaviourId)
652654
/// </summary>
653655
internal void UpdateNetworkProperties()
654656
{
657+
// Getting these ahead of time actually improves performance
655658
var networkObject = m_NetworkObject;
656659
var networkManager = m_NetworkManager;
657660

0 commit comments

Comments
 (0)