Skip to content

fix: NetworkList serialization sends the list values before the cached updates, to prevent duplicate application #1917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffreyrainy merged 2 commits into from
Apr 29, 2022
Merged

fix: NetworkList serialization sends the list values before the cached updates, to prevent duplicate application #1917

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e0606a
fix: NetworkList serialization sends the list values before the cache…
jeffreyrainy Apr 28, 2022
cfaa44a
Merge remote-tracking branch 'origin/develop' into fix/network-list-d…
jeffreyrainy Apr 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ namespace Unity.Netcode
public class NetworkList<T> : NetworkVariableSerialization<T> where T : unmanaged, IEquatable<T>
{
private NativeList<T> m_List = new NativeList<T>(64, Allocator.Persistent);
private NativeList<T> m_ListAtLastReset = new NativeList<T>(64, Allocator.Persistent);
private NativeList<NetworkListEvent<T>> m_DirtyEvents = new NativeList<NetworkListEvent<T>>(64, Allocator.Persistent);

/// <summary>
Expand Down Expand Up @@ -41,7 +42,11 @@ public NetworkList(IEnumerable<T> values = default,
public override void ResetDirty()
{
base.ResetDirty();
m_DirtyEvents.Clear();
if (m_DirtyEvents.Length > 0)
{
m_DirtyEvents.Clear();
m_ListAtLastReset.CopyFrom(m_List);
}
}

/// <inheritdoc />
Expand Down Expand Up @@ -109,10 +114,10 @@ public override void WriteDelta(FastBufferWriter writer)
/// <inheritdoc />
public override void WriteField(FastBufferWriter writer)
{
writer.WriteValueSafe((ushort)m_List.Length);
for (int i = 0; i < m_List.Length; i++)
writer.WriteValueSafe((ushort)m_ListAtLastReset.Length);
for (int i = 0; i < m_ListAtLastReset.Length; i++)
{
Write(writer, m_List[i]);
Write(writer, m_ListAtLastReset[i]);
}
}

Expand Down Expand Up @@ -454,6 +459,7 @@ public int LastModifiedTick
public override void Dispose()
{
m_List.Dispose();
m_ListAtLastReset.Dispose();
m_DirtyEvents.Dispose();
}
}
Expand Down