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

Added an abort condition to the cmd's funcparts chain.

Browse source
This commit is contained in:
Griatch 2013-02-20 00:17:50 +01:00
parent 0121f36ac0
commit 65e370f93b
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/commands/cmdhandler.py
View file

@ -273,7 +273,9 @@ def cmdhandler(caller, raw_string, testing=False):
if hasattr(cmd, "funcparts"): if hasattr(cmd, "funcparts"):
# yield on command parts (for multi-part delayed commands) # yield on command parts (for multi-part delayed commands)
for funcpart in make_iter(cmd.funcparts): for funcpart in make_iter(cmd.funcparts):
yield funcpart() err = yield funcpart()
# returning anything but a deferred/None will kill the chain
if err: break
# post-command hook # post-command hook
yield cmd.at_post_cmd() yield cmd.at_post_cmd()