From 6feb2336708dd98d8ab2f60d683ecedbdcd7aeef Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 9 Feb 2014 23:25:34 +0100 Subject: [PATCH 1/2] Fixed display issue in CmdOOCLook if Character was deleted. --- src/commands/default/player.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commands/default/player.py b/src/commands/default/player.py index 42b1e05dbd..a31bd4824b 100644 --- a/src/commands/default/player.py +++ b/src/commands/default/player.py @@ -80,8 +80,8 @@ class CmdOOCLook(MuxPlayerCommand): # caller is always a player at this point. player = self.player sessid = self.sessid - # get all our characters and sessions - characters = player.db._playable_characters + # get all our characters and sessions (clean removed ones) + characters = [character for character in player.db._playable_characters if character] sessions = player.get_all_sessions() is_su = player.is_superuser From 4d85a38260066b15c0c4178afee0b3d7140937e6 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 9 Feb 2014 23:32:32 +0100 Subject: [PATCH 2/2] Made a more consistent cleaning of the _playable_character list to remove stagnant references --- src/commands/default/player.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/commands/default/player.py b/src/commands/default/player.py index a31bd4824b..6247e8a4b5 100644 --- a/src/commands/default/player.py +++ b/src/commands/default/player.py @@ -80,8 +80,13 @@ class CmdOOCLook(MuxPlayerCommand): # caller is always a player at this point. player = self.player sessid = self.sessid - # get all our characters and sessions (clean removed ones) - characters = [character for character in player.db._playable_characters if character] + # 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 + sessions = player.get_all_sessions() is_su = player.is_superuser