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

Fixed an argument reading error regarding /charcurse + /randomchar support for it.

Browse Source
This commit is contained in:
Cerapter 2018-09-04 17:37:37 +02:00
parent fe955d6923
commit 956a10c379
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/commands.py
View File

@ -654,10 +654,13 @@ def ooc_cmd_reload(client, arg):
def ooc_cmd_randomchar(client, arg): def ooc_cmd_randomchar(client, arg):
if len(arg) != 0: if len(arg) != 0:
raise ArgumentError('This command has no arguments.') raise ArgumentError('This command has no arguments.')
try: if len(client.charcurse) > 0:
free_id = client.area.get_rand_avail_char_id() free_id = random.choice(client.charcurse)
except AreaError: else:
raise try:
free_id = client.area.get_rand_avail_char_id()
except AreaError:
raise
try: try:
client.change_character(free_id) client.change_character(free_id)
except ClientError: except ClientError:
@ -911,16 +914,16 @@ def ooc_cmd_charcurse(client, arg):
raise ArgumentError('You must specify a target (an ID) and at least one character ID. Consult /charids for the character IDs.') raise ArgumentError('You must specify a target (an ID) and at least one character ID. Consult /charids for the character IDs.')
elif len(arg) == 1: elif len(arg) == 1:
raise ArgumentError('You must specific at least one character ID. Consult /charids for the character IDs.') raise ArgumentError('You must specific at least one character ID. Consult /charids for the character IDs.')
args = arg.split()
try: try:
targets = client.server.client_manager.get_targets(client, TargetType.ID, int(arg[0]), False) targets = client.server.client_manager.get_targets(client, TargetType.ID, int(args[0]), False)
except: except:
raise ArgumentError('You must specify a valid target! Make sure it is a valid ID.') raise ArgumentError('You must specify a valid target! Make sure it is a valid ID.')
if targets: if targets:
for c in targets: for c in targets:
log_msg = ' ' + str(c.get_ip()) + ' to' log_msg = ' ' + str(c.get_ip()) + ' to'
part_msg = ' [' + str(c.id) + '] to' part_msg = ' [' + str(c.id) + '] to'
args = arg[1:].split() for raw_cid in args[1:]:
for raw_cid in args:
try: try:
cid = int(raw_cid) cid = int(raw_cid)
c.charcurse.append(cid) c.charcurse.append(cid)
@ -944,8 +947,9 @@ def ooc_cmd_uncharcurse(client, arg):
raise ClientError('You must be authorized to do that.') raise ClientError('You must be authorized to do that.')
elif len(arg) == 0: elif len(arg) == 0:
raise ArgumentError('You must specify a target (an ID).') raise ArgumentError('You must specify a target (an ID).')
args = arg.split()
try: try:
targets = client.server.client_manager.get_targets(client, TargetType.ID, int(arg[0]), False) targets = client.server.client_manager.get_targets(client, TargetType.ID, int(args[0]), False)
except: except:
raise ArgumentError('You must specify a valid target! Make sure it is a valid ID.') raise ArgumentError('You must specify a valid target! Make sure it is a valid ID.')
if targets: if targets: