From a39d52dd7ead5aa579f349ab6e3a2d35b1a88178 Mon Sep 17 00:00:00 2001 From: Dan Feeney Date: Sun, 29 May 2016 09:25:09 -0500 Subject: [PATCH] fixed nonexistent detail message by correcting the order of arguments to _AT_SEARCH_RESULT fixed room/detail key collisions by excluding caller.location from candidates --- evennia/contrib/extended_room.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evennia/contrib/extended_room.py b/evennia/contrib/extended_room.py index 7bcf10c7dc..48755edaf0 100644 --- a/evennia/contrib/extended_room.py +++ b/evennia/contrib/extended_room.py @@ -287,7 +287,10 @@ class CmdExtendedLook(default_cmds.CmdLook): caller = self.caller args = self.args if args: - looking_at_obj = caller.search(args, use_nicks=True, quiet=True) + looking_at_obj = caller.search(args, + candidates=caller.location.contents + caller.contents, + use_nicks=True, + quiet=True) if not looking_at_obj: # no object found. Check if there is a matching # detail at location. @@ -299,7 +302,7 @@ class CmdExtendedLook(default_cmds.CmdLook): caller.msg(detail) return # no detail found. Trigger delayed error messages - _AT_SEARCH_RESULT(caller, args, looking_at_obj, False) + _AT_SEARCH_RESULT(looking_at_obj, caller, args, quiet=False) return else: # we need to extract the match manually.