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

Merge branch 'develop' into accounts

Browse source
This commit is contained in:
Johnny 2018-10-22 15:03:06 -07:00 • committed by GitHub
commit 30b8519d39
4 changed files with 182 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/objects/objects.py
View file

@ -219,7 +219,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
@property
def is_connected(self):
# we get an error for objects subscribed to channels without this
if self.account: # seems sane to pass on the account
if self.account: # seems sane to pass on the account
return self.account.is_connected
else:
return False
@ -985,7 +985,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
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):