Merge branch 'master' into develop

2018-04-22 15:04:59 +02:00 · 2018-04-22 15:04:59 +02:00 · a5136e41d7
commit a5136e41d7
parent f57192f9f1 9bbfc422ee
4 changed files with 81 additions and 22 deletions
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@ -76,7 +76,8 @@ class CommandTest(EvenniaTest):
        old_msg = receiver.msg
        try:
            receiver.msg = Mock()
-            cmdobj.at_pre_cmd()
+            if cmdobj.at_pre_cmd():
+                return
            cmdobj.parse()
            ret = cmdobj.func()
            if isinstance(ret, types.GeneratorType):