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

Fixed a bug in @find not taking new Tag-based aliases into account.

Browse source
This commit is contained in:
Griatch 2013-12-02 10:09:40 +01:00
parent 1ba54202e8
commit a56b16db7b
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/commands/default/building.py
View file

@ -1874,15 +1874,16 @@ class CmdFind(MuxCommand):
nresults = results.count() nresults = results.count()
if not nresults: if not nresults:
# no matches on the keys. Try aliases instead. # no matches on the keys. Try aliases instead.
results = ObjectDB.db_aliases.filter(db_key=searchstring) results = ObjectDB.objects.filter(db_tags__db_key__iexact=searchstring, db_tags__db_category__iexact="object_alias")
#results = ObjectDB.db_aliases.filter(db_key=searchstring)
if "room" in switches: if "room" in switches:
results = results.filter(db_obj__db_location__isnull=True) results = results.filter(db_location__isnull=True)
if "exit" in switches: if "exit" in switches:
results = results.filter(db_obj__db_destination__isnull=False) results = results.filter(db_destination__isnull=False)
if "char" in switches: if "char" in switches:
results = results.filter(db_obj__db_typeclass_path=CHAR_TYPECLASS) results = results.filter(db_typeclass_path=CHAR_TYPECLASS)
# we have to parse alias -> real object here # we have to parse alias -> real object here
results = [result.db_obj for result in results] results = [result.dbobj for result in results]
nresults = len(results) nresults = len(results)
restrictions = "" restrictions = ""