From 7d207208dc94a47bdce9fd1ff682372eeb914b32 Mon Sep 17 00:00:00 2001 From: Cerapter Date: Sat, 1 Sep 2018 22:27:05 +0200 Subject: [PATCH] Unmute fix, `/getarea` prettying. --- server/client_manager.py | 7 +------ server/commands.py | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/server/client_manager.py b/server/client_manager.py index 292af2a..7395217 100644 --- a/server/client_manager.py +++ b/server/client_manager.py @@ -224,12 +224,7 @@ class ClientManager: info += '\r\n' lock = {True: '[LOCKED]', False: ''} - owner = 'FREE' - 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]) + info += '[{}]: [{} users][{}]{}'.format(area.abbreviation, len(area.clients), area.status, lock[area.is_locked]) sorted_clients = [] for client in area.clients: diff --git a/server/commands.py b/server/commands.py index f951ca6..a0dd295 100644 --- a/server/commands.py +++ b/server/commands.py @@ -809,10 +809,10 @@ def ooc_cmd_ooc_unmute(client, arg): if not client.is_mod: raise ClientError('You must be authorized to do that.') if len(arg) == 0: - raise ArgumentError('You must specify a target. Use /ooc_mute .') - targets = client.server.client_manager.get_targets(client, TargetType.ID, arg, False) + raise ArgumentError('You must specify a target. Use /ooc_unmute .') + targets = client.server.client_manager.get_ooc_muted_clients() if not targets: - raise ArgumentError('Target not found. Use /ooc_mute .') + raise ArgumentError('Targets not found. Use /ooc_unmute .') for target in targets: target.is_ooc_muted = False client.send_host_message('Unmuted {} existing client(s).'.format(len(targets)))