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

Unmute fix, /getarea prettying.

Browse Source
This commit is contained in:
Cerapter 2018-09-01 22:27:05 +02:00
parent 69c58694ed
commit 7d207208dc
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/client_manager.py
View File

@ -224,12 +224,7 @@ class ClientManager:
info += '\r\n' info += '\r\n'
lock = {True: '[LOCKED]', False: ''} lock = {True: '[LOCKED]', False: ''}
owner = 'FREE' info += '[{}]: [{} users][{}]{}'.format(area.abbreviation, len(area.clients), area.status, lock[area.is_locked])
if area.owned:
for client in [x for x in area.clients if x.is_cm]:
owner = 'CM: {}'.format(client.get_char_name())
break
info += '[{}]: [{} users][{}][{}]{}'.format(area.abbreviation, len(area.clients), area.status, owner, lock[area.is_locked])
sorted_clients = [] sorted_clients = []
for client in area.clients: for client in area.clients:

6
server/commands.py
View File

@ -809,10 +809,10 @@ def ooc_cmd_ooc_unmute(client, arg):
if not client.is_mod: if not client.is_mod:
raise ClientError('You must be authorized to do that.') raise ClientError('You must be authorized to do that.')
if len(arg) == 0: if len(arg) == 0:
raise ArgumentError('You must specify a target. Use /ooc_mute <OOC-name>.') raise ArgumentError('You must specify a target. Use /ooc_unmute <OOC-name>.')
targets = client.server.client_manager.get_targets(client, TargetType.ID, arg, False) targets = client.server.client_manager.get_ooc_muted_clients()
if not targets: if not targets:
raise ArgumentError('Target not found. Use /ooc_mute <OOC-name>.') raise ArgumentError('Targets not found. Use /ooc_unmute <OOC-name>.')
for target in targets: for target in targets:
target.is_ooc_muted = False target.is_ooc_muted = False
client.send_host_message('Unmuted {} existing client(s).'.format(len(targets))) client.send_host_message('Unmuted {} existing client(s).'.format(len(targets)))