Merge branch 'master' into feature/add-jupyter-notebook-support

Allows for jupyter notebook support via `evennia shell_plus --notebook` comand
2020-12-09 10:14:55 -06:00 · 2020-12-09 10:14:55 -06:00 · 68795e3adc
commit 68795e3adc
parent 198a192595 bbfae81e22
2 changed files with 2 additions and 2 deletions
--- a/evennia/accounts/accounts.py
+++ b/evennia/accounts/accounts.py
@ -373,7 +373,7 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase):
            puppet (Object): The matching puppeted object, if any.

        """
-        return session.puppet
+        return session.puppet if session else None

    def get_all_puppets(self):
        """