Use standard C# events instead of one callback (MirrorNetworking#100)

* Use standard C# events instead of one callback * Fix tests * Trigger new build * Trigger new build * Remove blank line
caiom · Nov 1, 2018 · 0a16b18 · 0a16b18
1 parent 9068803
commit 0a16b18
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/Mirror/Runtime/SyncList.cs b/Mirror/Runtime/SyncList.cs
@@ -105,7 +105,7 @@ public abstract class SyncList<T> : IList<T>, SyncObject
 
         public int Count { get { return m_Objects.Count; } }
         public bool IsReadOnly { get { return false; } }
-        public SyncListChanged Callback { get { return m_Callback; } set { m_Callback = value; } }
+        public event SyncListChanged Callback;
 
         public enum Operation : byte
         {
@@ -132,8 +132,6 @@ struct Change
         // so we need to skip them
         int changesAhead = 0;
 
-        SyncListChanged m_Callback;
-
         protected abstract void SerializeItem(NetworkWriter writer, T item);
         protected abstract T DeserializeItem(NetworkReader reader);
 
@@ -163,10 +161,10 @@ void AddOperation(Operation op, int itemIndex, T item)
 
             Changes.Add(change);
 
-            // ensure it is invoked on host
-            if (m_Callback != null)
+            SyncListChanged listChanged = Callback;
+            if (listChanged != null)
             {
-                m_Callback.Invoke(op, itemIndex);
+                listChanged(op, itemIndex);
             }
         }
 
@@ -321,9 +319,10 @@ public void OnDeserializeDelta(NetworkReader reader)
                         break;
                 }
 
-                if (m_Callback != null && apply)
+                SyncListChanged listChanged = Callback;
+                if (apply && listChanged != null)
                 {
-                    m_Callback.Invoke(operation, index);
+                    listChanged(operation, index);
                 }
 
                 // we just skipped this change

diff --git a/Mirror/Tests/SyncListTest.cs b/Mirror/Tests/SyncListTest.cs
@@ -166,8 +166,7 @@ public void SyncListFloatTest()
         public void CallbackTest()
         {
             bool called = false;
-            clientSyncList.Callback = (op, index) => { called = true; };
-
+            clientSyncList.Callback += (op, index) => { called = true; };
             serverSyncList.Add("yay");
             SerializeDeltaTo(serverSyncList, clientSyncList);