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

Resolve merge conflicts, some cleanup

Browse source
This commit is contained in:
Griatch 2019-04-14 12:18:15 +02:00
commit d1baab7c0b
15 changed files with 854 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
evennia/accounts/accounts.py
View file

@ -20,6 +20,7 @@ from django.utils.module_loading import import_string
from evennia.typeclasses.models import TypeclassBase
from evennia.accounts.manager import AccountManager
from evennia.accounts.models import AccountDB
from evennia.utils.option import OptionHandler
from evennia.objects.models import ObjectDB
from evennia.comms.models import ChannelDB
from evennia.commands import cmdhandler
@ -197,6 +198,10 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
def sessions(self):
return AccountSessionHandler(self)
@lazy_property
def options(self):
return OptionHandler(self, options_dict=settings.OPTIONS_ACCOUNT_DEFAULT, save_category='option')
# Do not make this a lazy property; the web UI will not refresh it!
@property
def characters(self):