From 4edbd8d4b9cc46a48dbf02ad4bbd04fccc67ea27 Mon Sep 17 00:00:00 2001 From: Alex Gravely Date: Sun, 4 Mar 2018 13:15:00 -0500 Subject: [PATCH] Allow nested ModuleBase classes to be built when declared from non-module classes. (#969) * Allow modules to be built regardless of their declaring type. * Need to exclude submodules. --- src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs b/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs index cf0f82474..996706a7c 100644 --- a/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs +++ b/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs @@ -48,8 +48,7 @@ namespace Discord.Commands /*if (!validTypes.Any()) throw new InvalidOperationException("Could not find any valid modules from the given selection");*/ - var topLevelGroups = validTypes.Where(x => x.DeclaringType == null); - var subGroups = validTypes.Intersect(topLevelGroups); + var topLevelGroups = validTypes.Where(x => x.DeclaringType == null || !IsValidModuleDefinition(x.DeclaringType.GetTypeInfo())); var builtTypes = new List();