diff options
| -rw-r--r-- | server/area_manager.py | 3 | ||||
| -rw-r--r-- | server/commands.py | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/server/area_manager.py b/server/area_manager.py index 3ee2b279..374c529f 100644 --- a/server/area_manager.py +++ b/server/area_manager.py @@ -44,6 +44,7 @@ class AreaManager: self.judgelog = [] self.current_music = '' self.current_music_player = '' + self.current_music_player_ipid = -1 self.evi_list = EvidenceList() self.is_recording = False self.recorded_messages = [] @@ -167,10 +168,12 @@ class AreaManager: def add_music_playing(self, client, name): self.current_music_player = client.get_char_name() + self.current_music_player_ipid = client.ipid self.current_music = name def add_music_playing_shownamed(self, client, showname, name): self.current_music_player = showname + " (" + client.get_char_name() + ")" + self.current_music_player_ipid = client.ipid self.current_music = name def get_evidence_list(self, client): diff --git a/server/commands.py b/server/commands.py index 701a82fa..14ae147d 100644 --- a/server/commands.py +++ b/server/commands.py @@ -152,7 +152,11 @@ def ooc_cmd_currentmusic(client, arg): raise ArgumentError('This command has no arguments.') if client.area.current_music == '': raise ClientError('There is no music currently playing.') - client.send_host_message('The current music is {} and was played by {}.'.format(client.area.current_music, + if client.is_mod: + client.send_host_message('The current music is {} and was played by {} ({}).'.format(client.area.current_music, + client.area.current_music_player, client.area.current_music_player_ipid)) + else: + client.send_host_message('The current music is {} and was played by {}.'.format(client.area.current_music, client.area.current_music_player)) def ooc_cmd_coinflip(client, arg): |