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

Fixed bug where user scripts filter on login uses typeclass instead of dbobj and crashes.

Browse source
This commit is contained in:
Kelketek 2013-09-29 13:35:39 -05:00
parent 45ea5a7cb5
commit 0484a944df
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/scripts/manager.py
View file

@ -42,13 +42,14 @@ class ScriptManager(TypedObjectManager):
""" """
if not obj: if not obj:
return [] return []
obj = obj.dbobj
if key: if key:
dbref = self.dbref(key) dbref = self.dbref(key)
if dbref or dbref == 0: if dbref or dbref == 0:
script = self.filter(db_obj=obj, id=dbref) script = self.filter(db_obj=obj, id=dbref)
if script: if script:
return script return script
return self.filter(db_obj=obj, db_key=key) return self.filter(db_obj=obj.dbobj, db_key=key)
return self.filter(db_obj=obj) return self.filter(db_obj=obj)
@returns_typeclass_list @returns_typeclass_list