Mirrored_Repos/houdini
1
0
Fork 0
mirror of https://github.com/solero/houdini.git synced 2025-11-04 06:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move client disconnect functionality into dummy event listener

Browse Source
This commit is contained in:
Ben
2019-09-09 22:21:14 +01:00
parent c9996c57e7
commit 78d042b1a3
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
houdini/handlers/play/navigation.py
View File

@@ -59,3 +59,16 @@ async def handle_join_room(p, room: Room, x: int, y: int):
@handlers.handler(XTPacket('j', 'grs')) @handlers.handler(XTPacket('j', 'grs'))
async def handle_refresh_room(p): async def handle_refresh_room(p):
await p.room.refresh(p) await p.room.refresh(p)
@handlers.disconnected
@handlers.player_attribute(joined_world=True)
async def handle_disconnect_room(p):
await p.room.remove_penguin(p)
del p.server.penguins_by_id[p.data.id]
del p.server.penguins_by_username[p.data.username]
server_key = '{}.players'.format(p.server.server_config['Id'])
await p.server.redis.srem(server_key, p.data.id)
await p.server.redis.hincrby('population', p.server.server_config['Id'], -1)

12
houdini/penguin.py
View File

@@ -311,18 +311,6 @@ class Penguin(Spheniscidae):
'{} removed their background item'.format( '{} removed their background item'.format(
self.data.username)) self.data.username))
async def _client_disconnected(self):
if self.joined_world:
if self.room is not None:
await self.room.remove_penguin(self)
del self.server.penguins_by_id[self.data.id]
del self.server.penguins_by_username[self.data.username]
await self.server.redis.hincrby('population', self.server.server_config['Id'], -1)
await super()._client_disconnected()
def __repr__(self): def __repr__(self):
if self.data is not None: if self.data is not None:
return '<Penguin ID=\'{}\' Username=\'{}\'>'.format(self.data.id, self.data.username) return '<Penguin ID=\'{}\' Username=\'{}\'>'.format(self.data.id, self.data.username)