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

Fixed bugs that now allows multiple sessions to connect through the same player to different characters. Still lots of bugs and inconsistencies, the permissions of superusers don't quite transfer sometimes, for example.

Browse source
This commit is contained in:
Griatch 2013-02-04 22:02:04 +01:00
parent 3aa122c41a
commit a84b4f24fc
4 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/players/models.py
View file

@ -465,7 +465,6 @@ class PlayerDB(TypedObject):
if not sessid:
return
char = _GA(self, "get_character")(sessid=sessid, return_dbobj=True)
print "disonnect session:", char
if char:
# call hook before disconnecting
_GA(char.typeclass, "at_disconnect")()
@ -512,9 +511,7 @@ class PlayerDB(TypedObject):
return char and (char == character.dbobj and (return_dbobj and char or char.typeclass)) or None
return char and (return_dbobj and char or char.typeclass) or None
elif character:
print character, character.dbobj, _GA(self,"db_objs").all()
char = _GA(self, "db_objs").filter(id=_GA(character.dbobj, "id"))
print "character:", character, char
return char and (return_dbobj and char[0] or char[0].typeclass) or None
else:
# no sessid given - return all available characters
@ -555,9 +552,8 @@ class PlayerDB(TypedObject):
if not character:
return
char = _GA(self, "get_character")(character=character, return_dbobj=True)
print "disconnect_char:", char
if char:
print _GA(self, "disconnect_session_from_character")(char.sessid)
err = _GA(self, "disconnect_session_from_character")(char.sessid)
_GA(self, "db_objs").remove(char)
del char.player
self.save()