From 15a8e177104cda455421a12c0a1c7722687ca891 Mon Sep 17 00:00:00 2001
From: SpaceEEC <wermail2002-kap@yahoo.de>
Date: Wed, 9 May 2018 16:07:20 +0200
Subject: [PATCH] fix(Guild): memberCount not decrementing when an uncached
 member leaves

Backported from commit: 93e083da4fd8a936d534abb6d16e42f37837da4d
---
 src/client/actions/GuildMemberRemove.js | 2 +-
 src/client/rest/RESTMethods.js          | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/client/actions/GuildMemberRemove.js b/src/client/actions/GuildMemberRemove.js
index beadac34b..6a2528ead 100644
--- a/src/client/actions/GuildMemberRemove.js
+++ b/src/client/actions/GuildMemberRemove.js
@@ -13,8 +13,8 @@ class GuildMemberRemoveAction extends Action {
     let member = null;
     if (guild) {
       member = guild.members.get(data.user.id);
+      guild.memberCount--;
       if (member) {
-        guild.memberCount--;
         guild._removeMember(member);
         this.deleted.set(guild.id + data.user.id, member);
         if (client.status === Constants.Status.READY) client.emit(Constants.Events.GUILD_MEMBER_REMOVE, member);
diff --git a/src/client/rest/RESTMethods.js b/src/client/rest/RESTMethods.js
index 7b122897d..f44c8cd85 100644
--- a/src/client/rest/RESTMethods.js
+++ b/src/client/rest/RESTMethods.js
@@ -416,12 +416,7 @@ class RESTMethods {
     return this.rest.makeRequest(
       'delete', Endpoints.Guild(guild).Member(member), true,
       undefined, undefined, reason)
-      .then(() =>
-        this.client.actions.GuildMemberRemove.handle({
-          guild_id: guild.id,
-          user: member.user,
-        }).member
-      );
+      .then(() => member);
   }
 
   createGuildRole(guild, data, reason) {