aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRapptz <[email protected]>2015-10-14 21:03:29 -0400
committerRapptz <[email protected]>2015-10-15 01:37:53 -0400
commit4ec052a35cd4ee812504ff9d1fd7240d546995ec (patch)
tree70e94c5de12107a160cbe5d10f2fb3b9720bcdd1
parentFixed get_default_role in Server attempting to access the wrong roles. (diff)
downloaddiscord.py-4ec052a35cd4ee812504ff9d1fd7240d546995ec.tar.xz
discord.py-4ec052a35cd4ee812504ff9d1fd7240d546995ec.zip
Check if the server is valid during GUILD_MEMBER_REMOVE.
-rw-r--r--discord/client.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/discord/client.py b/discord/client.py
index 6e8872ff..3640b2e7 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -276,10 +276,11 @@ class ConnectionState(object):
def handle_guild_member_remove(self, data):
server = self._get_server(data.get('guild_id'))
- user_id = data['user']['id']
- member = utils.find(lambda m: m.id == user_id, server.members)
- server.members.remove(member)
- self.dispatch('member_remove', member)
+ if server is not None:
+ user_id = data['user']['id']
+ member = utils.find(lambda m: m.id == user_id, server.members)
+ server.members.remove(member)
+ self.dispatch('member_remove', member)
def handle_guild_member_update(self, data):
server = self._get_server(data.get('guild_id'))