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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Christopher F
2017-06-27 08:49:53 -04:00
parent 1d612f15c8 04e71129cf
commit daae56e37e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ namespace Discord.Commands
{ {
foreach (var prop in ownerType.DeclaredProperties) foreach (var prop in ownerType.DeclaredProperties)
{ {
if (prop.SetMethod?.IsPublic == true && prop.GetCustomAttribute<DontInjectAttribute>() == null) if (prop.GetMethod?.IsStatic == false && prop.SetMethod?.IsPublic == true && prop.GetCustomAttribute<DontInjectAttribute>() == null)
result.Add(prop); result.Add(prop);
} }
ownerType = ownerType.BaseType.GetTypeInfo(); ownerType = ownerType.BaseType.GetTypeInfo();

3
src/Discord.Net.Core/Entities/Messages/EmbedType.cs
View File

@@ -7,6 +7,7 @@
Video, Video,
Image, Image,
Gifv, Gifv,
Article Article,
Tweet
} }
} }