Skip to content

fix: Fix a duplicate value bug with NetworkedList/Dictionary when run… #458

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
merged 2 commits into from
Feb 1, 2021
Merged

fix: Fix a duplicate value bug with NetworkedList/Dictionary when run… #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74b64e3
fix: Fix a duplicate value bug with NetworkedList/Dictionary when run…
LukeStampfli Jan 29, 2021
77205b3
refactor: Refactor fix for NetworkedList/NetworkedDictionary
LukeStampfli Jan 29, 2021
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
44 changes: 24 additions & 20 deletions com.unity.multiplayer.mlapi/Runtime/NetworkedVar/Collections/NetworkedDictionary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,10 +393,8 @@ public TValue this[TKey key]
key = key,
value = value
};
dirtyEvents.Add(dictionaryEvent);

if (NetworkingManager.Singleton.IsServer && OnDictionaryChanged != null)
OnDictionaryChanged(dictionaryEvent);
HandleAddDictionaryEvent(dictionaryEvent);
}
}

Expand Down Expand Up @@ -424,10 +422,8 @@ public void Add(TKey key, TValue value)
key = key,
value = value
};
dirtyEvents.Add(dictionaryEvent);

if (NetworkingManager.Singleton.IsServer && OnDictionaryChanged != null)
OnDictionaryChanged(dictionaryEvent);
HandleAddDictionaryEvent(dictionaryEvent);
}

/// <inheritdoc />
Expand All @@ -442,10 +438,8 @@ public void Add(KeyValuePair<TKey, TValue> item)
key = item.Key,
value = item.Value
};
dirtyEvents.Add(dictionaryEvent);

if (NetworkingManager.Singleton.IsServer && OnDictionaryChanged != null)
OnDictionaryChanged(dictionaryEvent);
HandleAddDictionaryEvent(dictionaryEvent);
}

/// <inheritdoc />
Expand All @@ -458,10 +452,8 @@ public void Clear()
{
eventType = NetworkedDictionaryEvent<TKey, TValue>.NetworkedListEventType.Clear
};
dirtyEvents.Add(dictionaryEvent);

if (NetworkingManager.Singleton.IsServer && OnDictionaryChanged != null)
OnDictionaryChanged(dictionaryEvent);
HandleAddDictionaryEvent(dictionaryEvent);
}

/// <inheritdoc />
Expand Down Expand Up @@ -503,10 +495,8 @@ public bool Remove(TKey key)
key = key,
value = value
};
dirtyEvents.Add(dictionaryEvent);

if (NetworkingManager.Singleton.IsServer && OnDictionaryChanged != null)
OnDictionaryChanged(dictionaryEvent);
HandleAddDictionaryEvent(dictionaryEvent);

return true;
}
Expand All @@ -524,11 +514,8 @@ public bool Remove(KeyValuePair<TKey, TValue> item)
key = item.Key,
value = item.Value
};
dirtyEvents.Add(dictionaryEvent);

if (NetworkingManager.Singleton.IsServer && OnDictionaryChanged != null)
OnDictionaryChanged(dictionaryEvent);

HandleAddDictionaryEvent(dictionaryEvent);
return true;
}

Expand All @@ -537,6 +524,23 @@ IEnumerator IEnumerable.GetEnumerator()
{
return dictionary.GetEnumerator();
}

private void HandleAddDictionaryEvent(NetworkedDictionaryEvent<TKey, TValue> dictionaryEvent)
{
if (NetworkingManager.Singleton.IsServer)
{
if (NetworkingManager.Singleton.ConnectedClients.Count > 0)
{
dirtyEvents.Add(dictionaryEvent);
}

OnDictionaryChanged?.Invoke(dictionaryEvent);
}
else
{
dirtyEvents.Add(dictionaryEvent);
}
}
}

/// <summary>
Expand All @@ -547,7 +551,7 @@ IEnumerator IEnumerable.GetEnumerator()
public struct NetworkedDictionaryEvent<TKey, TValue>
{
/// <summary>
/// Enum representing the different operations available for triggering an event.
/// Enum representing the different operations available for triggering an event.
/// </summary>
public enum NetworkedListEventType
{
Expand Down
44 changes: 24 additions & 20 deletions com.unity.multiplayer.mlapi/Runtime/NetworkedVar/Collections/NetworkedList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,8 @@ public void Add(T item)
value = item,
index = list.Count - 1
};
dirtyEvents.Add(listEvent);

if (NetworkingManager.Singleton.IsServer && OnListChanged != null)
OnListChanged(listEvent);
HandleAddListEvent(listEvent);
}

/// <inheritdoc />
Expand All @@ -430,10 +428,8 @@ public void Clear()
{
eventType = NetworkedListEvent<T>.EventType.Clear
};
dirtyEvents.Add(listEvent);

if (NetworkingManager.Singleton.IsServer && OnListChanged != null)
OnListChanged(listEvent);
HandleAddListEvent(listEvent);
}

/// <inheritdoc />
Expand All @@ -459,11 +455,8 @@ public bool Remove(T item)
eventType = NetworkedListEvent<T>.EventType.Remove,
value = item
};
dirtyEvents.Add(listEvent);

if (NetworkingManager.Singleton.IsServer && OnListChanged != null)
OnListChanged(listEvent);

HandleAddListEvent(listEvent);
return true;
}

Expand Down Expand Up @@ -491,10 +484,8 @@ public void Insert(int index, T item)
index = index,
value = item
};
dirtyEvents.Add(listEvent);

if (NetworkingManager.Singleton.IsServer && OnListChanged != null)
OnListChanged(listEvent);
HandleAddListEvent(listEvent);
}

/// <inheritdoc />
Expand All @@ -508,10 +499,8 @@ public void RemoveAt(int index)
eventType = NetworkedListEvent<T>.EventType.RemoveAt,
index = index
};
dirtyEvents.Add(listEvent);

if (NetworkingManager.Singleton.IsServer && OnListChanged != null)
OnListChanged(listEvent);
HandleAddListEvent(listEvent);
}


Expand All @@ -530,10 +519,25 @@ public T this[int index]
index = index,
value = value
};
dirtyEvents.Add(listEvent);

if (NetworkingManager.Singleton.IsServer && OnListChanged != null)
OnListChanged(listEvent);
HandleAddListEvent(listEvent);
}
}

private void HandleAddListEvent(NetworkedListEvent<T> listEvent)
{
if (NetworkingManager.Singleton.IsServer)
{
if (NetworkingManager.Singleton.ConnectedClients.Count > 0)
{
dirtyEvents.Add(listEvent);
}

OnListChanged?.Invoke(listEvent);
}
else
{
dirtyEvents.Add(listEvent);
}
}
}
Expand All @@ -545,7 +549,7 @@ public T this[int index]
public struct NetworkedListEvent<T>
{
/// <summary>
/// Enum representing the different operations available for triggering an event.
/// Enum representing the different operations available for triggering an event.
/// </summary>
public enum EventType
{
Expand Down