fix(core): Fix small bugs introduced by style fixes. (#245)

pkaminski · TwoTenPvP · commit 6889c1291bd4 · 2019-05-28T21:22:41.000+02:00
diff --git a/MLAPI/Messaging/ReflectionMethod.cs b/MLAPI/Messaging/ReflectionMethod.cs
@@ -53,8 +53,6 @@ internal ReflectionMethod(MethodInfo method, ParameterInfo[] parameters, RPCAttr
                 serverTarget = false;
             }
 
-            parameterTypes = new Type[parameters.Length];
-
             if (parameters.Length == 2 && method.ReturnType == typeof(void) && parameters[0].ParameterType == typeof(ulong) && parameters[1].ParameterType == typeof(Stream))
             {
                 useDelegate = true;
@@ -63,6 +61,7 @@ internal ReflectionMethod(MethodInfo method, ParameterInfo[] parameters, RPCAttr
             {
                 useDelegate = false;
 
+                parameterTypes = new Type[parameters.Length];
                 parameterRefs = new object[parameters.Length];
 
                 for (int i = 0; i < parameters.Length; i++)
diff --git a/MLAPI/Messaging/RpcTypeDefinition.cs b/MLAPI/Messaging/RpcTypeDefinition.cs
@@ -52,7 +52,7 @@ private static List<MethodInfo> GetAllMethods(Type type, Type limitType)
 
             while (type != null && type != limitType)
             {
-                list.AddRange(type.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance));
+                list.AddRange(type.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
 
                 type = type.BaseType;
             }

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,6 @@ internal ReflectionMethod(MethodInfo method, ParameterInfo[] parameters, RPCAttr`
`53`	`53`	`serverTarget = false;`
`54`	`54`	`}`
`55`	`55`
`56`		`- parameterTypes = new Type[parameters.Length];`
`57`		`-`
`58`	`56`	`if (parameters.Length == 2 && method.ReturnType == typeof(void) && parameters[0].ParameterType == typeof(ulong) && parameters[1].ParameterType == typeof(Stream))`
`59`	`57`	`{`
`60`	`58`	`useDelegate = true;`
`@@ -63,6 +61,7 @@ internal ReflectionMethod(MethodInfo method, ParameterInfo[] parameters, RPCAttr`
`63`	`61`	`{`
`64`	`62`	`useDelegate = false;`
`65`	`63`
	`64`	`+ parameterTypes = new Type[parameters.Length];`
`66`	`65`	`parameterRefs = new object[parameters.Length];`
`67`	`66`
`68`	`67`	`for (int i = 0; i < parameters.Length; i++)`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ private static List<MethodInfo> GetAllMethods(Type type, Type limitType)`
`52`	`52`
`53`	`53`	`while (type != null && type != limitType)`
`54`	`54`	`{`
`55`		`- list.AddRange(type.GetMethods(BindingFlags.Public \| BindingFlags.NonPublic \| BindingFlags.Instance));`
	`55`	`+ list.AddRange(type.GetMethods(BindingFlags.Public \| BindingFlags.NonPublic \| BindingFlags.Instance \| BindingFlags.DeclaredOnly));`
`56`	`56`
`57`	`57`	`type = type.BaseType;`
`58`	`58`	`}`