Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make at_post_cmd() run after func() also for delayed commands. Resolve #2179

Browse source
This commit is contained in:
Griatch 2020-09-01 22:58:54 +02:00
parent 1e5c302e9b
commit 9040aafb05
2 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

31
evennia/commands/cmdhandler.py
View file

@ -206,7 +206,7 @@ def _progressive_cmd_run(cmd, generator, response=None):
else:
value = generator.send(response)
except StopIteration:
pass
raise
else:
if isinstance(value, (int, float)):
utils.delay(value, _progressive_cmd_run, cmd, generator)
@ -631,20 +631,31 @@ def cmdhandler(
ret = cmd.func()
if isinstance(ret, types.GeneratorType):
# cmd.func() is a generator, execute progressively
_progressive_cmd_run(cmd, ret)
in_generator = True
try:
_progressive_cmd_run(cmd, ret)
except StopIteration:
# this means func() has run its course
in_generator = False
yield None
else:
in_generator = False
ret = yield ret
# post-command hook
yield cmd.at_post_cmd()
if not in_generator:
# this will only run if we are out of the generator for this
# cmd, otherwise we would have at_post_cmd run before a delayed
# func() finished
if cmd.save_for_next:
# store a reference to this command, possibly
# accessible by the next command.
caller.ndb.last_cmd = yield copy(cmd)
else:
caller.ndb.last_cmd = None
# post-command hook
yield cmd.at_post_cmd()
if cmd.save_for_next:
# store a reference to this command, possibly
# accessible by the next command.
caller.ndb.last_cmd = yield copy(cmd)
else:
caller.ndb.last_cmd = None
# return result to the deferred
returnValue(ret)