From 054e148c94c168e89e90f9b3e0f78c5da857a1df Mon Sep 17 00:00:00 2001 From: Paulo Date: Fri, 9 Mar 2018 17:27:12 -0300 Subject: [PATCH] Fix override and rollback to old behaviour --- .../Builders/ModuleClassBuilder.cs | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs b/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs index e9ce9eb86..cb82ae46b 100644 --- a/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs +++ b/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs @@ -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.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(typeReaderType.GetTypeInfo(), service, services); - service.AddTypeReader(paramType, reader); - - return reader; - } - private static bool IsValidModuleDefinition(TypeInfo typeInfo) { return _moduleTypeInfo.IsAssignableFrom(typeInfo) &&