Browse Source

Fix override and rollback to old behaviour

pull/976/head
Paulo GitHub 7 years ago
parent
commit
054e148c94
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 18 deletions
  1. +1
    -18
      src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs

+ 1
- 18
src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs View File

@@ -246,7 +246,7 @@ namespace Discord.Commands
builder.Summary = summary.Text;
break;
case OverrideTypeReaderAttribute typeReader:
builder.TypeReader = GetTypeReader(service, paramType, typeReader.TypeReader, services);
builder.TypeReader = ReflectionUtils.CreateObject<TypeReader>(typeReader.TypeReader.GetTypeInfo(), service, EmptyServiceProvider.Instance);
break;
case ParamArrayAttribute _:
builder.IsMultiple = true;
@@ -279,23 +279,6 @@ namespace Discord.Commands
}
}

private static TypeReader GetTypeReader(CommandService service, Type paramType, Type typeReaderType, IServiceProvider services)
{
var readers = service.GetTypeReaders(paramType);
TypeReader reader = null;
if (readers != null)
{
if (readers.TryGetValue(typeReaderType, out reader))
return reader;
}

//We dont have a cached type reader, create one
reader = ReflectionUtils.CreateObject<TypeReader>(typeReaderType.GetTypeInfo(), service, services);
service.AddTypeReader(paramType, reader);

return reader;
}

private static bool IsValidModuleDefinition(TypeInfo typeInfo)
{
return _moduleTypeInfo.IsAssignableFrom(typeInfo) &&


Loading…
Cancel
Save