Browse Source

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

tags/1.0
Christopher F 8 years ago
parent
commit
daae56e37e
2 changed files with 3 additions and 2 deletions
  1. +1
    -1
      src/Discord.Net.Commands/Utilities/ReflectionUtils.cs
  2. +2
    -1
      src/Discord.Net.Core/Entities/Messages/EmbedType.cs

+ 1
- 1
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();


+ 2
- 1
src/Discord.Net.Core/Entities/Messages/EmbedType.cs View File

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

Loading…
Cancel
Save