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

Re-add missing fix for candidates removed in refactor

Browse source 
Resolves #1763.
This commit is contained in:
Griatch 2019-01-04 19:36:24 +01:00
parent 598126d25c
commit 855e7f32b0
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
evennia/objects/objects.py
View file

@ -432,8 +432,8 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
# only allow exact matching if searching the entire database # only allow exact matching if searching the entire database
# or unique #dbrefs # or unique #dbrefs
exact = True exact = True
else:
# TODO: write code...if candidates is None: elif candidates is None:
# no custom candidates given - get them automatically # no custom candidates given - get them automatically
if location: if location:
# location(s) were given # location(s) were given
@ -1950,13 +1950,13 @@ class DefaultCharacter(DefaultObject):
if len(account.characters) >= settings.MAX_NR_CHARACTERS: if len(account.characters) >= settings.MAX_NR_CHARACTERS:
errors.append("There are too many characters associated with this account.") errors.append("There are too many characters associated with this account.")
return obj, errors return obj, errors
# Create the Character # Create the Character
obj = create.create_object(**kwargs) obj = create.create_object(**kwargs)
# Record creator id and creation IP # Record creator id and creation IP
if ip: obj.db.creator_ip = ip if ip: obj.db.creator_ip = ip
if account: if account:
obj.db.creator_id = account.id obj.db.creator_id = account.id
if obj not in account.characters: if obj not in account.characters:
account.db._playable_characters.append(obj) account.db._playable_characters.append(obj)
@ -1973,7 +1973,7 @@ class DefaultCharacter(DefaultObject):
# If no description is set, set a default description # If no description is set, set a default description
if description or not obj.db.desc: if description or not obj.db.desc:
obj.db.desc = description if description else "This is a character." obj.db.desc = description if description else "This is a character."
except Exception as e: except Exception as e:
errors.append("An error occurred while creating this '%s' object." % key) errors.append("An error occurred while creating this '%s' object." % key)
logger.log_err(e) logger.log_err(e)