fix: enumerating NetworkVariables with BindingFlags.DeclaredOnly … (#2340)

jeffreyrainy · web-flow · commit 4bcacf117b35 · 2022-12-08T11:35:52.000-05:00
fix: enumerating NetworkVariables with BindingFlags.DeclaredOnly so that derived classes with NetworkVariables don't get doubly enumerated
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs
@@ -570,11 +570,11 @@ private static FieldInfo[] GetFieldInfoForTypeRecursive(Type type, List<FieldInf
             if (list == null)
             {
                 list = new List<FieldInfo>();
-                list.AddRange(type.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance));
+                list.AddRange(type.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
             }
             else
             {
-                list.AddRange(type.GetFields(BindingFlags.NonPublic | BindingFlags.Instance));
+                list.AddRange(type.GetFields(BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
             }
 
             if (type.BaseType != null && type.BaseType != typeof(NetworkBehaviour))

Original file line number	Diff line number	Diff line change
`@@ -570,11 +570,11 @@ private static FieldInfo[] GetFieldInfoForTypeRecursive(Type type, List<FieldInf`
`570`	`570`	`if (list == null)`
`571`	`571`	`{`
`572`	`572`	`list = new List<FieldInfo>();`
`573`		`- list.AddRange(type.GetFields(BindingFlags.Public \| BindingFlags.NonPublic \| BindingFlags.Instance));`
	`573`	`+ list.AddRange(type.GetFields(BindingFlags.Public \| BindingFlags.NonPublic \| BindingFlags.Instance \| BindingFlags.DeclaredOnly));`
`574`	`574`	`}`
`575`	`575`	`else`
`576`	`576`	`{`
`577`		`- list.AddRange(type.GetFields(BindingFlags.NonPublic \| BindingFlags.Instance));`
	`577`	`+ list.AddRange(type.GetFields(BindingFlags.NonPublic \| BindingFlags.Instance \| BindingFlags.DeclaredOnly));`
`578`	`578`	`}`
`579`	`579`
`580`	`580`	`if (type.BaseType != null && type.BaseType != typeof(NetworkBehaviour))`