From e5107b1a4eb936389f02b581f978d6809e52b265 Mon Sep 17 00:00:00 2001 From: Griatch Date: Thu, 3 Feb 2022 19:30:33 +0100 Subject: [PATCH] Further adjustment for deletion sequence --- evennia/contrib/game_systems/turnbattle/tb_basic.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/evennia/contrib/game_systems/turnbattle/tb_basic.py b/evennia/contrib/game_systems/turnbattle/tb_basic.py index 27c15372d7..240758e357 100644 --- a/evennia/contrib/game_systems/turnbattle/tb_basic.py +++ b/evennia/contrib/game_systems/turnbattle/tb_basic.py @@ -410,7 +410,9 @@ class TBBasicTurnHandler(DefaultScript): Called at script termination. """ for fighter in self.db.fighters: - self.rules.combat_cleanup(fighter) # Clean up the combat attributes for every fighter. + if fighter: + # Clean up the combat attributes for every fighter. + self.rules.combat_cleanup(fighter) self.obj.db.combat_turnhandler = None # Remove reference to turn handler in location def at_repeat(self):