Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-19 06:16:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a spurious error messages from the location setter when logging out (need to check None location)

Browse source
This commit is contained in:
Griatch 2012-08-19 21:36:01 +02:00
parent a35fd9018e
commit f5caab093e
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/objects/models.py
View file

@ -285,7 +285,8 @@ class ObjectDB(TypedObject):
# update the contents of each location
if old_loc:
old_loc.contents_update(self, remove=True)
loc.contents_update(self.typeclass)
if loc:
loc.contents_update(self.typeclass)
except Exception:
string = "Cannot set location: "
string += "%s is not a valid location."

2
src/utils/utils.py
View file

@ -394,7 +394,7 @@ def inherits_from(obj, parent):
Takes an object and tries to determine if it inherits at any distance
from parent. What differs this function from e.g. isinstance()
is that obj may be both an instance and a class, and parent
< may be an instance, a class, or the python path to a class (counting
may be an instance, a class, or the python path to a class (counting
from the evennia root directory).
"""