From 6e863f2bd74b7eeb169ce550f3b39cfc00ea7ddc Mon Sep 17 00:00:00 2001 From: ChrisLR Date: Wed, 19 Jan 2022 12:25:51 -0500 Subject: [PATCH] Refactored home/no-home usage and fixed exception catch --- evennia/objects/manager.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/evennia/objects/manager.py b/evennia/objects/manager.py index 724a8588a9..851a3da1d9 100644 --- a/evennia/objects/manager.py +++ b/evennia/objects/manager.py @@ -676,15 +676,19 @@ class ObjectDBManager(TypedObjectManager): location = dbid_to_obj(location, self.model) destination = dbid_to_obj(destination, self.model) - home = dbid_to_obj(home, self.model) - if not home: + if home: + home = dbid_to_obj(home, self.model) + + if not nohome and not home: try: - home = dbid_to_obj(settings.DEFAULT_HOME, self.model) if not nohome else None - except self.model_ObjectDB.DoesNotExist: + home = dbid_to_obj(settings.DEFAULT_HOME, self.model) + except self.model.DoesNotExist: raise self.model.DoesNotExist( "settings.DEFAULT_HOME (= '%s') does not exist, or the setting is malformed." % settings.DEFAULT_HOME ) + elif nohome and not home: + home = None # create new instance new_object = typeclass(