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

Can log in, still errors all over the place due to missing .typeclass/.dbobj

Browse source
This commit is contained in:
Griatch 2014-12-28 20:00:31 +01:00
parent b839614259
commit 3d557f6bf9
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/objects/objects.py
View file

@ -289,8 +289,7 @@ class DefaultObject(ObjectDB):
return self.db_player and self.db_player.is_superuser \ return self.db_player and self.db_player.is_superuser \
and not self.db_player.attributes.get("_quell") and not self.db_player.attributes.get("_quell")
@property def contents_get(self, exclude=None):
def contents(self):
""" """
Returns the contents of this object, i.e. all Returns the contents of this object, i.e. all
objects that has this object set as its location. objects that has this object set as its location.
@ -298,7 +297,9 @@ class DefaultObject(ObjectDB):
exclude is one or more objects to not return exclude is one or more objects to not return
""" """
return ObjectDB.objects.get_contents(self) return ObjectDB.objects.get_contents(self, excludeobj=exclude)
contents = property(contents_get)
@property @property
def exits(self): def exits(self):

7
src/players/player.py
View file

@ -221,9 +221,9 @@ class DefaultPlayer(PlayerDB):
return False return False
# do the disconnect, but only if we are the last session to puppet # do the disconnect, but only if we are the last session to puppet
obj.at_pre_unpuppet() obj.at_pre_unpuppet()
obj.dbobj.sessid.remove(sessid) obj.sessid.remove(sessid)
if not obj.dbobj.sessid.count(): if not obj.sessid.count():
del obj.dbobj.player del obj.player
obj.at_post_unpuppet(self, sessid=sessid) obj.at_post_unpuppet(self, sessid=sessid)
session.puppet = None session.puppet = None
session.puid = None session.puid = None
@ -244,7 +244,6 @@ class DefaultPlayer(PlayerDB):
player's end. player's end.
sessid - return character connected to this sessid, sessid - return character connected to this sessid,
character - return character if connected to this player, else None.
""" """
session = self.get_session(sessid) session = self.get_session(sessid)

2
src/typeclasses/models.py
View file

@ -286,7 +286,7 @@ class TypedObject(SharedMemoryModel):
""" """
Returns the object's dbref on the form #NN. Returns the object's dbref on the form #NN.
""" """
return "#%s" % GA(self, "_TypedObject__dbid_get")() return "#%s" % self.dbid
def __dbref_set(self): def __dbref_set(self):
raise Exception("dbref cannot be set!") raise Exception("dbref cannot be set!")