@@ -90,8 +90,6 @@ 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
94- var networkManager = m_NetworkManager ;
9593 var serverRpcMessage = new ServerRpcMessage
9694 {
9795 Metadata = new RpcMetadata
@@ -111,7 +109,7 @@ internal void __endSendServerRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
111109 networkDelivery = MessageDeliveryType < ServerRpcMessage > . DefaultDelivery ;
112110 break ;
113111 case RpcDelivery . Unreliable :
114- if ( bufferWriter . Length > networkManager . MessageManager . NonFragmentedMessageMaxSize )
112+ if ( bufferWriter . Length > m_NetworkManager . MessageManager . NonFragmentedMessageMaxSize )
115113 {
116114 throw new OverflowException ( "RPC parameters are too large for unreliable delivery." ) ;
117115 }
@@ -128,8 +126,8 @@ internal void __endSendServerRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
128126 var context = new NetworkContext
129127 {
130128 SenderId = NetworkManager . ServerClientId ,
131- Timestamp = networkManager . RealTimeProvider . RealTimeSinceStartup ,
132- SystemOwner = networkManager ,
129+ Timestamp = m_NetworkManager . RealTimeProvider . RealTimeSinceStartup ,
130+ SystemOwner = m_NetworkManager ,
133131 // header information isn't valid since it's not a real message.
134132 // RpcMessage doesn't access this stuff so it's just left empty.
135133 Header = new NetworkMessageHeader ( ) ,
@@ -142,7 +140,7 @@ internal void __endSendServerRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
142140 }
143141 else
144142 {
145- rpcWriteSize = networkManager . ConnectionManager . SendMessage ( ref serverRpcMessage , networkDelivery , NetworkManager . ServerClientId ) ;
143+ rpcWriteSize = m_NetworkManager . ConnectionManager . SendMessage ( ref serverRpcMessage , networkDelivery , NetworkManager . ServerClientId ) ;
146144 }
147145
148146 bufferWriter . Dispose ( ) ;
@@ -652,28 +650,24 @@ protected NetworkBehaviour GetNetworkBehaviour(ushort behaviourId)
652650 /// </summary>
653651 internal void UpdateNetworkProperties ( )
654652 {
655- // Getting these ahead of time actually improves performance
656- var networkObject = m_NetworkObject ;
657- var networkManager = m_NetworkManager ;
658-
659653 // Set identification related properties
660- NetworkObjectId = networkObject . NetworkObjectId ;
661- IsLocalPlayer = networkObject . IsLocalPlayer ;
654+ NetworkObjectId = m_NetworkObject . NetworkObjectId ;
655+ IsLocalPlayer = m_NetworkObject . IsLocalPlayer ;
662656
663657 // Set ownership related properties
664- IsOwnedByServer = networkObject . IsOwnedByServer ;
665- IsOwner = networkObject . IsOwner ;
666- OwnerClientId = networkObject . OwnerClientId ;
658+ IsOwnedByServer = m_NetworkObject . IsOwnedByServer ;
659+ IsOwner = m_NetworkObject . IsOwner ;
660+ OwnerClientId = m_NetworkObject . OwnerClientId ;
667661
668662 // Set NetworkManager dependent properties
669- if ( networkManager != null )
670- {
671- IsHost = networkManager . IsListening && networkManager . IsHost ;
672- IsClient = networkManager . IsListening && networkManager . IsClient ;
673- IsServer = networkManager . IsListening && networkManager . IsServer ;
674- IsSessionOwner = networkManager . IsListening && networkManager . LocalClient . IsSessionOwner ;
675- HasAuthority = networkObject . HasAuthority ;
676- ServerIsHost = networkManager . IsListening && networkManager . ServerIsHost ;
663+ if ( m_NetworkManager != null )
664+ {
665+ IsHost = m_NetworkManager . IsListening && m_NetworkManager . IsHost ;
666+ IsClient = m_NetworkManager . IsListening && m_NetworkManager . IsClient ;
667+ IsServer = m_NetworkManager . IsListening && m_NetworkManager . IsServer ;
668+ IsSessionOwner = m_NetworkManager . IsListening && m_NetworkManager . LocalClient . IsSessionOwner ;
669+ HasAuthority = m_NetworkObject . HasAuthority ;
670+ ServerIsHost = m_NetworkManager . IsListening && m_NetworkManager . ServerIsHost ;
677671 }
678672 }
679673
0 commit comments