Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Jukebox and area locking bugfixes.

Browse Source
This commit is contained in:
Cerapter 2018-08-24 12:58:59 +02:00
parent 9ce2ec9de2
commit 4ee565591f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/area_manager.py
View File

@ -205,7 +205,7 @@ class AreaManager:
def can_send_message(self, client): 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.') client.send_host_message('This is a locked area - ask the CM to speak.')
return False return False
return (time.time() * 1000.0 - self.next_message_time) > 0 return (time.time() * 1000.0 - self.next_message_time) > 0

4
server/client_manager.py
View File

@ -106,8 +106,6 @@ class ClientManager:
return True return True
def disconnect(self): def disconnect(self):
if self.area.jukebox:
self.area.remove_jukebox_vote(self, True)
self.transport.close() self.transport.close()
def change_character(self, char_id, force=False): def change_character(self, char_id, force=False):
@ -337,6 +335,8 @@ class ClientManager:
def remove_client(self, client): def remove_client(self, client):
if client.area.jukebox:
client.area.remove_jukebox_vote(client, True)
heappush(self.cur_id, client.id) heappush(self.cur_id, client.id)
self.clients.remove(client) self.clients.remove(client)