From 152e86a7f35911712419cb95f399bcf588e426e7 Mon Sep 17 00:00:00 2001 From: Tim Chaplin Date: Mon, 18 Jan 2021 16:37:20 -0500 Subject: [PATCH] Don't override location passed through kwargs --- evennia/accounts/accounts.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/evennia/accounts/accounts.py b/evennia/accounts/accounts.py index d8c7ccd735..9bb5acbf29 100644 --- a/evennia/accounts/accounts.py +++ b/evennia/accounts/accounts.py @@ -184,7 +184,7 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase): - at_server_reload() - at_server_shutdown() - """ + """ objects = AccountManager() @@ -680,6 +680,9 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase): ) Character = class_from_module(character_typeclass) + if "location" not in kwargs: + kwargs["location"] = ObjectDB.objects.get_id(settings.START_LOCATION) + # Create the character character, errs = Character.create( character_key, @@ -687,7 +690,6 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase): ip=character_ip, typeclass=character_typeclass, permissions=character_permissions, - location=ObjectDB.objects.get_id(settings.START_LOCATION), **kwargs, ) if character: