From 75fb31e939d374a2306230dbfbc3d3ce58870e5c Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Fri, 14 Oct 2016 13:12:47 -0300
Subject: [PATCH] Removed IDiscordClient reference from IEntity

---
 src/Discord.Net.Core/Entities/IEntity.cs                | 4 ++--
 src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs | 2 +-
 src/Discord.Net.Rest/Entities/RestEntity.cs             | 2 --
 src/Discord.Net.Rpc/Entities/RpcEntity.cs               | 2 --
 src/Discord.Net.WebSocket/Entities/SocketEntity.cs      | 2 --
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Discord.Net.Core/Entities/IEntity.cs b/src/Discord.Net.Core/Entities/IEntity.cs
index b1bb922c9..711fd0555 100644
--- a/src/Discord.Net.Core/Entities/IEntity.cs
+++ b/src/Discord.Net.Core/Entities/IEntity.cs
@@ -5,8 +5,8 @@ namespace Discord
     public interface IEntity<TId>
         where TId : IEquatable<TId>
     {
-        /// <summary> Gets the IDiscordClient that created this object. </summary>
-        IDiscordClient Discord { get; }
+        ///// <summary> Gets the IDiscordClient that created this object. </summary>
+        //IDiscordClient Discord { get; }
 
         /// <summary> Gets the unique identifier for this object. </summary>
         TId Id { get; }
diff --git a/src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs b/src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs
index ccd24e5dd..697203223 100644
--- a/src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs
+++ b/src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs
@@ -188,7 +188,7 @@ namespace Discord.Rest
                     };
                     if (info.Position != null)
                         args.AfterUserId = info.Position.Value;
-                    var models = await guild.Discord.ApiClient.GetGuildMembersAsync(guild.Id, args, options).ConfigureAwait(false);
+                    var models = await client.ApiClient.GetGuildMembersAsync(guild.Id, args, options).ConfigureAwait(false);
                     return models
                         .Select(x => RestGuildUser.Create(client, guild, x))
                         .Where(x => x.GetPermissions(channel).ReadMessages)
diff --git a/src/Discord.Net.Rest/Entities/RestEntity.cs b/src/Discord.Net.Rest/Entities/RestEntity.cs
index adf7b6921..f893600ba 100644
--- a/src/Discord.Net.Rest/Entities/RestEntity.cs
+++ b/src/Discord.Net.Rest/Entities/RestEntity.cs
@@ -13,7 +13,5 @@ namespace Discord.Rest
             Discord = discord;
             Id = id;
         }
-
-        IDiscordClient IEntity<T>.Discord => Discord;
     }
 }
diff --git a/src/Discord.Net.Rpc/Entities/RpcEntity.cs b/src/Discord.Net.Rpc/Entities/RpcEntity.cs
index 9fecd77ff..e5b26cbe7 100644
--- a/src/Discord.Net.Rpc/Entities/RpcEntity.cs
+++ b/src/Discord.Net.Rpc/Entities/RpcEntity.cs
@@ -13,7 +13,5 @@ namespace Discord.Rpc
             Discord = discord;
             Id = id;
         }
-
-        IDiscordClient IEntity<T>.Discord => Discord;
     }
 }
diff --git a/src/Discord.Net.WebSocket/Entities/SocketEntity.cs b/src/Discord.Net.WebSocket/Entities/SocketEntity.cs
index 072e414f8..db1b7dc4f 100644
--- a/src/Discord.Net.WebSocket/Entities/SocketEntity.cs
+++ b/src/Discord.Net.WebSocket/Entities/SocketEntity.cs
@@ -13,7 +13,5 @@ namespace Discord.WebSocket
             Discord = discord;
             Id = id;
         }
-
-        IDiscordClient IEntity<T>.Discord => Discord;
     }
 }