Fixed SyncedVar issues

Author: TwoTenPvP

MLAPI/Data/FieldType.cs

@@ -1,21 +1,47 @@
 using MLAPI.NetworkingManagerComponents.Binary;
 using System;
-using System.Collections.Generic;
-using System.Reflection;
 using UnityEngine;
 
 namespace MLAPI.Data
 {
     internal static class FieldTypeHelper
     {
+        internal static bool ObjectEqual(object o1, object o2)
+        {
+            if (o1.GetType() != o2.GetType())
+                return false;
+            if (o1.GetType().IsArray != o2.GetType().IsArray)
+                return false;
+            if (o1.GetType().IsArray && o1.GetType().GetElementType() != o2.GetType().GetElementType())
+                return false;
+
+            if (o1.GetType().IsArray)
+            {
+                Array ar1 = (Array)o1;
+                Array ar2 = (Array)o2;
+                if (ar1.Length != ar2.Length)
+                    return false;
+
+                int i = 0;
+                foreach (object item in ar1)
+                {
+                    if (item != ar2.GetValue(i))
+                        return false;
+                    i++;
+                }
+                return true;
+            }
+            return o1.Equals(o2);
+        }
+
         internal static void WriteFieldType(BitWriter writer, object value)
         {
             Type type = value.GetType();
             if (type.IsArray)
             {
-                ushort arrayLength = (ushort)((Array)value).Length;
+                Array array = (Array)value;
+                ushort arrayLength = (ushort)array.Length;
                 writer.WriteUShort(arrayLength);
-                IEnumerable<object> array = (IEnumerable<object>)value;
                 foreach (object element in array) WriteFieldType(writer, element);
             }
             else

MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs

@@ -524,10 +524,10 @@ internal void FlushToClient(uint clientId)
                 writer.WriteUShort(networkedObject.GetOrderIndex(this)); //Behaviour OrderIndex
 
                 bool[] mask = GetDirtyMask(false, clientId);
-                for (int i = 0; i < mask.Length; i++) writer.WriteBool(mask[i]);
 
                 for (int i = 0; i < syncedVarFields.Count; i++)
                 {
+                    writer.WriteBool(mask[i]);
                     if (syncedVarFields[i].Target && clientId != ownerClientId)
                         continue;
                     FieldTypeHelper.WriteFieldType(writer, syncedVarFields[i].FieldInfo.GetValue(this));
@@ -584,10 +584,10 @@ internal void SyncVarUpdate()
                     writer.WriteUShort(networkedObject.GetOrderIndex(this)); //Behaviour OrderIndex
 
                     bool[] mask = GetDirtyMask(false);
-                    for (int i = 0; i < mask.Length; i++) writer.WriteBool(mask[i]);
 
                     for (int i = 0; i < syncedVarFields.Count; i++)
                     {
+                        writer.WriteBool(mask[i]);
                         //Writes all the indexes of the dirty syncvars.
                         if (syncedVarFields[i].Dirty == true)
                         {
@@ -616,10 +616,10 @@ internal void SyncVarUpdate()
                         writer.WriteUShort(networkedObject.GetOrderIndex(this)); //Behaviour OrderIndex
 
                         bool[] mask = GetDirtyMask(false);
-                        for (int i = 0; i < mask.Length; i++) writer.WriteBool(mask[i]);
 
                         for (int i = 0; i < syncedVarFields.Count; i++)
                         {
+                            writer.WriteBool(mask[i]);
                             //Writes all the indexes of the dirty syncvars.
                             if (syncedVarFields[i].Dirty == true)
                             {
@@ -649,10 +649,10 @@ internal void SyncVarUpdate()
                     writer.WriteUShort(networkedObject.GetOrderIndex(this)); //Behaviour OrderIndex
 
                     bool[] mask = GetDirtyMask(true);
-                    for (int i = 0; i < mask.Length; i++) writer.WriteBool(mask[i]);
 
                     for (int i = 0; i < syncedVarFields.Count; i++)
                     {
+                        writer.WriteBool(mask[i]);
                         //Writes all the indexes of the dirty syncvars.
                         if (syncedVarFields[i].Dirty == true && !syncedVarFields[i].Target)
                         {
@@ -682,7 +682,7 @@ private bool SetDirtyness()
                 if (NetworkingManager.singleton.NetworkTime - syncedVarFields[i].Attribute.lastSyncTime < syncedVarFields[i].Attribute.syncDelay)
                     continue;
                 //Big TODO. This will return true for reference objects. This NEEDS to be fixed. a better compare
-                if (!syncedVarFields[i].FieldInfo.GetValue(this).Equals(syncedVarFields[i].FieldValue))
+                if (!FieldTypeHelper.ObjectEqual(syncedVarFields[i].FieldInfo.GetValue(this).GetHashCode(), syncedVarFields[i].FieldValue))
                 {
                     syncedVarFields[i].Dirty = true; //This fields value is out of sync!
                     syncedVarFields[i].Attribute.lastSyncTime = NetworkingManager.singleton.NetworkTime;