Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-22 07:46:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed object.player to return a typeclass. Resolves Issue 325. Also made sure that .typeclass always returns a typeclass, also if called on something which is already a typeclass.

Browse source
This commit is contained in:
Griatch 2013-04-10 22:33:32 +02:00
parent 4669b8ed89
commit 5874505902
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/objects/models.py
View file

@ -250,7 +250,13 @@ class ObjectDB(TypedObject):
We have to be careful here since Player is also
a TypedObject, so as to not create a loop.
"""
return get_field_cache(self, "player")
player = get_field_cache(self, "player")
if player:
try:
return player.typeclass
except Exception,e:
print "player_get:", e
return player
#@player.setter
def __player_set(self, player):
@ -470,8 +476,8 @@ class ObjectDB(TypedObject):
Retrieve sessions connected to this object.
"""
# if the player is not connected, this will simply be an empty list.
if _GA(self, "player"):
return _GA(_GA(self, "player"), "sessions")
if _GA(self, "db_player"):
return _GA(_GA(self, "db_player"), "get_all_sessions")()
return []
sessions = property(__sessions_get)