Merge branch 'master' into develop

2017-12-31 13:42:59 +01:00 · 2017-12-31 13:42:59 +01:00 · c18c0fc479
commit c18c0fc479
parent 21403222dc 0d3b8f4079
5 changed files with 48 additions and 13 deletions
--- a/evennia/contrib/tutorial_world/rooms.py
+++ b/evennia/contrib/tutorial_world/rooms.py
@ -168,7 +168,7 @@ class CmdTutorialLook(default_cmds.CmdLook):
                else:
                    # no detail found, delegate our result to the normal
                    # error message handler.
-                    _SEARCH_AT_RESULT(None, caller, args, looking_at_obj)
+                    _SEARCH_AT_RESULT(looking_at_obj, caller, args)
                    return
            else:
                # we found a match, extract it from the list and carry on