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

Fix bug in multi-object alias targeting. Resolves #1823

Browse source
This commit is contained in:
Griatch 2019-06-03 07:01:03 +02:00
parent e130ec2d6f
commit 08b0f3fbf8
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/__init__.py
View file

@ -170,7 +170,7 @@ def _init():
global create_message, create_help_entry global create_message, create_help_entry
global settings, lockfuncs, logger, utils, gametime, ansi, spawn, managers global settings, lockfuncs, logger, utils, gametime, ansi, spawn, managers
global contrib, TICKER_HANDLER, MONITOR_HANDLER, SESSION_HANDLER global contrib, TICKER_HANDLER, MONITOR_HANDLER, SESSION_HANDLER
global CHANNEL_HANDLER, TASK_HANDLER global CHANNEL_HANDLER, TASK_HANDLER
global GLOBAL_SCRIPTS, OPTION_CLASSES global GLOBAL_SCRIPTS, OPTION_CLASSES
global EvMenu, EvTable, EvForm, EvMore, EvEditor global EvMenu, EvTable, EvForm, EvMore, EvEditor
global ANSIString global ANSIString

9
evennia/objects/manager.py
View file

@ -281,11 +281,11 @@ class ObjectDBManager(TypedObjectManager):
index_matches = string_partial_matching(key_strings, ostring, ret_index=True) index_matches = string_partial_matching(key_strings, ostring, ret_index=True)
if index_matches: if index_matches:
# a match by key # a match by key
return [obj for ind, obj in enumerate(search_candidates) if ind in index_matches] return list({obj for ind, obj in enumerate(search_candidates) if ind in index_matches})
else: else:
# match by alias rather than by key # match by alias rather than by key
search_candidates = search_candidates.filter(db_tags__db_tagtype__iexact="alias", search_candidates = search_candidates.filter(db_tags__db_tagtype__iexact="alias",
db_tags__db_key__icontains=ostring) db_tags__db_key__icontains=ostring).distinct()
alias_strings = [] alias_strings = []
alias_candidates = [] alias_candidates = []
# TODO create the alias_strings and alias_candidates lists more efficiently? # TODO create the alias_strings and alias_candidates lists more efficiently?
@ -295,7 +295,8 @@ class ObjectDBManager(TypedObjectManager):
alias_candidates.append(candidate) alias_candidates.append(candidate)
index_matches = string_partial_matching(alias_strings, ostring, ret_index=True) index_matches = string_partial_matching(alias_strings, ostring, ret_index=True)
if index_matches: if index_matches:
return [alias_candidates[ind] for ind in index_matches] # it's possible to have multiple matches to the same Object, we must weed those out
return list({alias_candidates[ind] for ind in index_matches})
return [] return []
# main search methods and helper functions # main search methods and helper functions
@ -507,7 +508,7 @@ class ObjectDBManager(TypedObjectManager):
# copy over all tags, if any # copy over all tags, if any
for tag in original_object.tags.get(return_tagobj=True, return_list=True): for tag in original_object.tags.get(return_tagobj=True, return_list=True):
new_object.tags.add(tag=tag.key, category=tag.category, data=tag.data) new_object.tags.add(tag=tag.key, category=tag.category, data=tag.data)
return new_object return new_object
def clear_all_sessids(self): def clear_all_sessids(self):

1
evennia/objects/objects.py
View file

@ -466,6 +466,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
candidates=candidates, candidates=candidates,
exact=exact, exact=exact,
use_dbref=use_dbref) use_dbref=use_dbref)
if quiet: if quiet:
return results return results
return _AT_SEARCH_RESULT(results, self, query=searchdata, return _AT_SEARCH_RESULT(results, self, query=searchdata,