Skip to content

Commit 2aa38fe

Browse files
fix
Fixing some minor merge artifacts.
1 parent ae0a8cf commit 2aa38fe

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventData.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,7 @@ internal void SynchronizeSceneNetworkObjects(NetworkManager networkManager)
11041104
// information during synchronization.
11051105
if (serializedObject.HasGhost)
11061106
{
1107-
if (networkManager.SpawnManager.GhostSpawnManager.ShouldDeferGhostSceneObject(serializedObject, InternalBuffer))
1107+
if (networkManager.SpawnManager.GhostSpawnManager.ShouldDeferGhostSceneObject(serializedObject, m_InternalBuffer))
11081108
{
11091109
continue;
11101110
}
@@ -1122,10 +1122,10 @@ internal void SynchronizeSceneNetworkObjects(NetworkManager networkManager)
11221122
continue;
11231123
}
11241124

1125-
var noStop = m_InternalBuffer.Position;
1125+
11261126
if (EnableSerializationLogs)
11271127
{
1128-
var noStop = InternalBuffer.Position;
1128+
var noStop = m_InternalBuffer.Position;
11291129
builder.AppendLine($"[Head: {noStart}][Tail: {noStop}][Size: {noStop - noStart}][{spawnedNetworkObject.name}][NID-{spawnedNetworkObject.NetworkObjectId}][Children: {spawnedNetworkObject.ChildNetworkBehaviours.Count}]");
11301130
LogArray(m_InternalBuffer.ToArray(), noStart, noStop, builder);
11311131
}

com.unity.netcode.gameobjects/Runtime/Serialization/FastBufferReader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ public unsafe void ReadValue(out string s, bool oneByteChars = false)
633633
}
634634
#endif
635635

636-
if (!TryBeginReadInternal(SizeOfLengthField()))
636+
if (!TryBeginReadInternal(sizeof(int)))
637637
{
638638
throw new OverflowException("Reading past the end of the buffer");
639639
}

0 commit comments

Comments
 (0)