Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-31 21:17:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Minor fixes to handle addition of created chars to account playable characters list, and check for multisession mode compliance.

Browse source
This commit is contained in:
Johnny 2018-10-24 18:57:48 +00:00
parent 1398ad49e1
commit ecfb86072d
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
evennia/accounts/accounts.py
View file

@ -733,7 +733,8 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
if character:
# Update playable character list
account.db._playable_characters.append(character)
if character not in account.characters:
account.db._playable_characters.append(character)
# We need to set this to have @ic auto-connect to this character
account.db._last_puppet = character

12
evennia/objects/objects.py
View file

@ -1944,12 +1944,20 @@ class DefaultCharacter(DefaultObject):
locks = kwargs.pop('locks', '')
try:
# Check to make sure account does not have too many chars
if len(account.characters) >= settings.MAX_NR_CHARACTERS:
errors.append("There are too many characters associated with this account.")
return obj, errors
# Create the Character
obj = create.create_object(**kwargs)
# Record creator id and creation IP
if ip: obj.db.creator_ip = ip
if account: obj.db.creator_id = account.id
if account:
obj.db.creator_id = account.id
if obj not in account.characters:
account.db._playable_characters.append(obj)
# Add locks
if not locks and account:
@ -1963,7 +1971,7 @@ class DefaultCharacter(DefaultObject):
# If no description is set, set a default description
if description or not obj.db.desc:
obj.db.desc = description if description else "This is a character."
except Exception as e:
errors.append("An error occurred while creating this '%s' object." % key)
logger.log_err(e)