From 8647bf23674e59518e74651602b82d159c6c1e69 Mon Sep 17 00:00:00 2001 From: Kate Date: Fri, 21 Aug 2015 22:21:57 -0600 Subject: [PATCH] Fix for NoneType exceptions when initial_setup.py is run where multisession_mode is not set to 0. --- evennia/commands/default/player.py | 10 ++++++---- evennia/server/initial_setup.py | 6 +++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/evennia/commands/default/player.py b/evennia/commands/default/player.py index 0d39dcdb4..941201793 100644 --- a/evennia/commands/default/player.py +++ b/evennia/commands/default/player.py @@ -83,10 +83,12 @@ class CmdOOCLook(MuxPlayerCommand): sessid = self.sessid # get all our characters and sessions characters = player.db._playable_characters - if None in characters: - # clean up list if character object was deleted in between - characters = [character for character in characters if character] - player.db._playable_characters = characters + + if characters is not None: + if None in characters: + # clean up list if character object was deleted in between + characters = [character for character in characters if character] + player.db._playable_characters = characters sessions = player.get_all_sessions() is_su = player.is_superuser diff --git a/evennia/server/initial_setup.py b/evennia/server/initial_setup.py index 35b6fb46e..6eed64e4a 100644 --- a/evennia/server/initial_setup.py +++ b/evennia/server/initial_setup.py @@ -105,7 +105,11 @@ def create_objects(): god_player.attributes.add("_first_login", True) god_player.attributes.add("_last_puppet", god_character) - god_player.db._playable_characters.append(god_character) + + try: + god_player.db._playable_characters.append(god_character) + except AttributeError: + pass room_typeclass = settings.BASE_ROOM_TYPECLASS limbo_obj = create.create_object(room_typeclass, _('Limbo'), nohome=True)