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

Make sure to avoid double multi-matches from rpsystem. Resolve #1757

Browse source
This commit is contained in:
Griatch 2019-06-08 17:34:30 +02:00
parent c083f767d8
commit 21a5285954
2 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/objects/manager.py
View file

@ -265,9 +265,9 @@ class ObjectDBManager(TypedObjectManager):
type_restriction = typeclasses and Q(db_typeclass_path__in=make_iter(typeclasses)) or Q()
if exact:
# exact match - do direct search
return self.filter(cand_restriction & type_restriction & (
return (self.filter(cand_restriction & type_restriction & (
Q(db_key__iexact=ostring) | Q(db_tags__db_key__iexact=ostring) & Q(
db_tags__db_tagtype__iexact="alias"))).order_by('id').distinct()
db_tags__db_tagtype__iexact="alias")))).distinct().order_by('id')
elif candidates:
# fuzzy with candidates
search_candidates = self.filter(cand_restriction & type_restriction).distinct().order_by('id')