fixes detecting inherited Schema types inside ArraySchema/MapSchema

colyseus · Apr 12, 2020 · b8505f9 · b8505f9
1 parent bc717d1
commit b8505f9
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/Assets/Plugins/Colyseus/Serializer/Schema/Schema.cs b/Assets/Plugins/Colyseus/Serializer/Schema/Schema.cs
@@ -122,6 +122,7 @@ public class ArraySchema<T> : ISchemaCollection
     public event KeyValueEventHandler<T, int> OnAdd;
     public event KeyValueEventHandler<T, int> OnChange;
     public event KeyValueEventHandler<T, int> OnRemove;
+    private bool _hasSchemaChild = Schema.CheckSchemaChild(typeof(T));
 
     public ArraySchema()
     {
@@ -156,7 +157,7 @@ public bool ContainsKey(object key)
 
     public bool HasSchemaChild
     {
-      get { return typeof(T).BaseType == typeof(Schema); }
+      get { return _hasSchemaChild; }
     }
 
     public int Count
@@ -232,6 +233,7 @@ public class MapSchema<T> : ISchemaCollection
     public event KeyValueEventHandler<T, string> OnAdd;
     public event KeyValueEventHandler<T, string> OnChange;
     public event KeyValueEventHandler<T, string> OnRemove;
+    private bool _hasSchemaChild = Schema.CheckSchemaChild(typeof(T));
 
     public MapSchema()
     {
@@ -266,7 +268,7 @@ public bool ContainsKey(object key)
 
     public bool HasSchemaChild
     {
-      get { return typeof(T).BaseType == typeof(Schema); }
+      get { return _hasSchemaChild; }
     }
 
     public T this[string key]
@@ -760,6 +762,22 @@ protected object CreateTypeInstance(byte[] bytes, Iterator it, System.Type type)
         return Activator.CreateInstance(type);
       }
     }
+
+    public static bool CheckSchemaChild(System.Type toCheck) {
+      System.Type generic = typeof(Schema);
+
+      while (toCheck != null && toCheck != typeof(object)) {
+        var cur = toCheck.IsGenericType ? toCheck.GetGenericTypeDefinition() : toCheck;
+
+        if (generic == cur) {
+          return true;
+        }
+
+        toCheck = toCheck.BaseType;
+      }
+
+      return false;
+    }
   }
 
   public class ReflectionField : Schema