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

Merge branch 'develop' into smarturls

Browse source
This commit is contained in:
Johnny 2018-10-22 13:58:34 -07:00 • committed by GitHub
commit b414eadff2
35 changed files with 485 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/objects/objects.py
View file

@ -917,8 +917,12 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
# no need to disconnect, Account just jumps to OOC mode.
# sever the connection (important!)
if self.account:
# Remove the object from playable characters list
if self in self.account.db._playable_characters:
self.account.db._playable_characters = [x for x in self.account.db._playable_characters if x != self]
for session in self.sessions.all():
self.account.unpuppet_object(session)
self.account = None
for script in _ScriptDB.objects.get_all_scripts_on_obj(self):