From e35a42c9fdbe70822fd3ea3e3585c1e0529fa05f Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 28 Mar 2015 12:42:00 +0100 Subject: [PATCH] The script pause mechanism was not called at server shutdown. Resolves #729. --- evennia/server/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evennia/server/server.py b/evennia/server/server.py index 2cc3706446..5dbafb5aa6 100644 --- a/evennia/server/server.py +++ b/evennia/server/server.py @@ -344,8 +344,7 @@ class Evennia(object): # call restart hooks yield [o.at_server_reload() for o in ObjectDB.get_all_cached_instances()] yield [p.at_server_reload() for p in PlayerDB.get_all_cached_instances()] - yield [(s.pause(), s.at_server_reload()) - for s in ScriptDB.get_all_cached_instances()] + yield [(s.pause(), s.at_server_reload()) for s in ScriptDB.get_all_cached_instances()] yield self.sessions.all_sessions_portal_sync() ServerConfig.objects.conf("server_restart_mode", "reload") @@ -367,6 +366,7 @@ class Evennia(object): yield [o.at_server_shutdown() for o in ObjectDB.get_all_cached_instances()] yield [(p.unpuppet_all(), p.at_server_shutdown()) for p in PlayerDB.get_all_cached_instances()] + yield [(s.pause(), s.at_server_reload()) for s in ScriptDB.get_all_cached_instances()] yield [s.at_server_shutdown() for s in ScriptDB.get_all_cached_instances()] yield ObjectDB.objects.clear_all_sessids() ServerConfig.objects.conf("server_restart_mode", "reset")