From 8e294e68ffffa6f5601e13b605a6f261303c5ef0 Mon Sep 17 00:00:00 2001 From: David Estrada Date: Mon, 20 Apr 2020 18:59:55 -0700 Subject: [PATCH] Seems DefaultObject search should return a list, even if _AT_SEARCH_RESULT returns None --- evennia/objects/objects.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py index b5ec9a7647..c51b8079ba 100644 --- a/evennia/objects/objects.py +++ b/evennia/objects/objects.py @@ -498,7 +498,7 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase): use_dbref=use_dbref, ) - return _AT_SEARCH_RESULT( + matches = _AT_SEARCH_RESULT( results, self, query=searchdata, @@ -506,6 +506,9 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase): nofound_string=nofound_string, multimatch_string=multimatch_string, ) + if matches: + return matches + return [] def search_account(self, searchdata, quiet=False): """