fix: backports a fix to networkedlist/dictionary from #458 (#461)

Author: LukeStampfli

MLAPI/NetworkedVar/Collections/NetworkedDictionary.cs

@@ -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);
             }
         }
 
@@ -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 />
@@ -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 />
@@ -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 />
@@ -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;
         }
@@ -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;
         }
 
@@ -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>
@@ -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
         {

MLAPI/NetworkedVar/Collections/NetworkedList.cs

@@ -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 />
@@ -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 />
@@ -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;
         }
 
@@ -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 />
@@ -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);
         }
 
 
@@ -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);
             }
         }
     }
@@ -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
         {