X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=mudpy%2Fmisc.py;fp=mudpy%2Fmisc.py;h=ecab4718610790367ea334c5157a8b3ec8ed9c77;hp=ec331a4b8dffdf7467de2e2b16bbc0da88417591;hb=c4245fbcb7129049f24512f21fba727e620246dc;hpb=eecae7d240916774df48fc6fcf340fed86e3bb74 diff --git a/mudpy/misc.py b/mudpy/misc.py index ec331a4..ecab471 100644 --- a/mudpy/misc.py +++ b/mudpy/misc.py @@ -1918,33 +1918,14 @@ def handler_active(user): command = find_command(command_name) # if it's allowed, do it - ran = False + result = None if actor.can_run(command): - # dereference the relative object path for the requested function - # TODO(fungi) use call_hook_function() here instead - action = mudpy action_fname = command.get("action", command.key) - for component in action_fname.split("."): - try: - action = getattr(action, component) - ran = True - except AttributeError: - log('Could not find action function "%s" for command "%s"' - % (action_fname, command_name)) - action = None - break - if action: - try: - action(actor, parameters) - except Exception: - log('Command string "%s" from user %s raised an ' - 'exception...\n%s' % ( - input_data, actor.owner.account.get("name"), - traceback.format_exc())) - mudpy.command.error(actor, input_data) + if action_fname: + result = call_hook_function(action_fname, (actor, parameters)) # if the command was not run, give an error - if not ran: + if not result: mudpy.command.error(actor, input_data) # if no input, just idle back with a prompt