diff options
| author | Cerapter <cerap@protonmail.com> | 2018-08-24 12:58:59 +0200 |
|---|---|---|
| committer | Cerapter <cerap@protonmail.com> | 2018-08-24 12:58:59 +0200 |
| commit | 4ee565591f4e4bd278336ca182c1b516236829cf (patch) | |
| tree | 7ac7499315627ed55a12159a3b52023a900d7b58 | |
| parent | 9ce2ec9de23c12729896c494ff6c42689664d08d (diff) | |
Jukebox and area locking bugfixes.
| -rw-r--r-- | server/area_manager.py | 2 | ||||
| -rw-r--r-- | server/client_manager.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/server/area_manager.py b/server/area_manager.py index 90229d0c..372195b9 100644 --- a/server/area_manager.py +++ b/server/area_manager.py @@ -205,7 +205,7 @@ class AreaManager: def can_send_message(self, client): - if self.is_locked and not client.is_mod and not client.ipid in self.invite_list: + if self.is_locked and not client.is_mod and not client.id in self.invite_list: client.send_host_message('This is a locked area - ask the CM to speak.') return False return (time.time() * 1000.0 - self.next_message_time) > 0 diff --git a/server/client_manager.py b/server/client_manager.py index 62e141dd..709e0d8f 100644 --- a/server/client_manager.py +++ b/server/client_manager.py @@ -106,8 +106,6 @@ class ClientManager: return True def disconnect(self): - if self.area.jukebox: - self.area.remove_jukebox_vote(self, True) self.transport.close() def change_character(self, char_id, force=False): @@ -337,6 +335,8 @@ class ClientManager: def remove_client(self, client): + if client.area.jukebox: + client.area.remove_jukebox_vote(client, True) heappush(self.cur_id, client.id) self.clients.remove(client) |