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

Fixed /mods showing all the areas that don't have mods.

Browse Source
This commit is contained in:
Cerapter 2018-09-02 22:57:54 +02:00
parent c8142f3f53
commit 21f489a261
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/client_manager.py
View File

@ -216,7 +216,7 @@ class ClientManager:
self.send_host_message(msg) self.send_host_message(msg)
def get_area_info(self, area_id, mods): def get_area_info(self, area_id, mods):
info = '' info = '\r\n'
try: try:
area = self.server.area_manager.get_area_by_id(area_id) area = self.server.area_manager.get_area_by_id(area_id)
except AreaError: except AreaError:
@ -231,6 +231,8 @@ class ClientManager:
for client in area.clients: for client in area.clients:
if (not mods) or client.is_mod: if (not mods) or client.is_mod:
sorted_clients.append(client) sorted_clients.append(client)
if not sorted_clients:
return ''
sorted_clients = sorted(sorted_clients, key=lambda x: x.get_char_name()) sorted_clients = sorted(sorted_clients, key=lambda x: x.get_char_name())
for c in sorted_clients: for c in sorted_clients:
info += '\r\n' info += '\r\n'
@ -253,7 +255,7 @@ class ClientManager:
for i in range(len(self.server.area_manager.areas)): for i in range(len(self.server.area_manager.areas)):
if len(self.server.area_manager.areas[i].clients) > 0: if len(self.server.area_manager.areas[i].clients) > 0:
cnt += len(self.server.area_manager.areas[i].clients) cnt += len(self.server.area_manager.areas[i].clients)
info += '\r\n{}'.format(self.get_area_info(i, mods)) info += '{}'.format(self.get_area_info(i, mods))
info = 'Current online: {}'.format(cnt) + info info = 'Current online: {}'.format(cnt) + info
else: else:
try: try: