charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NetworkIdentity.UNetUpdate: component serialization size check moved to OnSerializeSafely so that it happens for both calling functions (UNetSerializeAllVars and UNetUpdate). Also simplifies UNetUpdate code and removes dependency on NetworkWriter.Position.

Browse Source
This commit is contained in:
vis2k 2018-07-21 14:41:43 +02:00
parent b76680dfda
commit 9227eacbbf
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Unity-Technologies-networking/Runtime/NetworkIdentity.cs
View File

@ -429,6 +429,13 @@ internal bool OnSerializeSafely(NetworkBehaviour comp, NetworkWriter writer, boo
byte[] bytes = temp.ToArray(); byte[] bytes = temp.ToArray();
if (LogFilter.logDebug) { Debug.Log("OnSerializeSafely written for object=" + comp.name + " component=" + comp.GetType() + " sceneId=" + m_SceneId + " length=" + bytes.Length); } if (LogFilter.logDebug) { Debug.Log("OnSerializeSafely written for object=" + comp.name + " component=" + comp.GetType() + " sceneId=" + m_SceneId + " length=" + bytes.Length); }
// original HLAPI had a warning in UNetUpdate() in case of large state updates. let's move it here, might
// be useful for debugging.
if (bytes.Length > NetworkServer.maxPacketSize)
{
if (LogFilter.logWarn) { Debug.LogWarning("Large state update of " + bytes.Length + " bytes for netId:" + netId + " from script:" + comp); }
}
// serialize length,data into the real writer, untouched by user code // serialize length,data into the real writer, untouched by user code
writer.WriteBytesAndSize(bytes); writer.WriteBytesAndSize(bytes);
return result; return result;
@ -684,10 +691,8 @@ internal void UNetUpdate()
writer.Write(netId); writer.Write(netId);
bool wroteData = false; bool wroteData = false;
int oldPos;
for (int i = 0; i < m_NetworkBehaviours.Length; i++) for (int i = 0; i < m_NetworkBehaviours.Length; i++)
{ {
oldPos = writer.Position;
NetworkBehaviour comp = m_NetworkBehaviours[i]; NetworkBehaviour comp = m_NetworkBehaviours[i];
if (comp.GetDirtyChannel() != channelId) if (comp.GetDirtyChannel() != channelId)
{ {
@ -708,10 +713,6 @@ internal void UNetUpdate()
wroteData = true; wroteData = true;
} }
if (writer.Position - oldPos > NetworkServer.maxPacketSize)
{
if (LogFilter.logWarn) { Debug.LogWarning("Large state update of " + (writer.Position - oldPos) + " bytes for netId:" + netId + " from script:" + comp); }
}
} }
if (!wroteData) if (!wroteData)