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

Merge branch 'issue/365'

Browse Source 
Conflicts:
	src/Discord.Net.Commands/CommandService.cs
This commit is contained in:
Christopher F
2016-11-26 22:26:47 -05:00
parent fb99b019a0 5cdda592c1
commit 55f6efd080
4 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Discord.Net.Commands/CommandService.cs
View File

@@ -21,8 +21,8 @@ namespace Discord.Commands
internal readonly RunMode _defaultRunMode;
public IEnumerable<ModuleInfo> Modules => _typedModuleDefs.Select(x => x.Value);
public IEnumerable<CommandInfo> Commands => _typedModuleDefs.SelectMany(x => x.Value.Commands);
public IEnumerable<ModuleInfo> Modules => _moduleDefs.Select(x => x);
public IEnumerable<CommandInfo> Commands => _moduleDefs.SelectMany(x => x.Commands);
public CommandService() : this(new CommandServiceConfig()) { }
public CommandService(CommandServiceConfig config)