github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better implimentation of detection

Browse Source
This commit is contained in:
Khionu Sybiern
2017-03-01 08:08:07 -05:00
parent df6579260e
commit c350debdba
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Discord.Net.Commands/Utilities/ReflectionUtils.cs
View File

@@ -51,6 +51,8 @@ namespace Discord.Commands
}; };
} }
private static readonly TypeInfo _dependencyTypeInfo = typeof(IDependencyMap).GetTypeInfo();
internal static object GetMember(Type targetType, IDependencyMap map, CommandService service, TypeInfo baseType) internal static object GetMember(Type targetType, IDependencyMap map, CommandService service, TypeInfo baseType)
{ {
object arg; object arg;
@@ -58,7 +60,7 @@ namespace Discord.Commands
{ {
if (targetType == typeof(CommandService)) if (targetType == typeof(CommandService))
arg = service; arg = service;
else if (targetType.GetTypeInfo().ImplementedInterfaces.Contains(typeof(IDependencyMap))) else if (_dependencyTypeInfo.IsAssignableFrom(targetType.GetTypeInfo()))
arg = map; arg = map;
else else
throw new InvalidOperationException($"Failed to create \"{baseType.FullName}\", dependency \"{targetType.Name}\" was not found."); throw new InvalidOperationException($"Failed to create \"{baseType.FullName}\", dependency \"{targetType.Name}\" was not found.");