diff options
author | Loic Blot <loic.blot@unix-experience.fr> | 2015-02-17 20:09:36 +0100 |
---|---|---|
committer | Loic Blot <loic.blot@unix-experience.fr> | 2015-02-18 09:28:39 +0100 |
commit | 27d4e89d326337c8d8cafc681acde8bfbde7de77 (patch) | |
tree | 05122a05a2178adf57c5ac8b1038fb8eaefef46b /src/server.cpp | |
parent | b019221c30f58ce1944d8f2421b40b31ba364716 (diff) | |
download | minetest-27d4e89d326337c8d8cafc681acde8bfbde7de77.tar.gz minetest-27d4e89d326337c8d8cafc681acde8bfbde7de77.tar.bz2 minetest-27d4e89d326337c8d8cafc681acde8bfbde7de77.zip |
Fix unused (and so, broken) enable_rollback_recording. This option must be reloaded at server loop but loaded when server starts, for data consistency (not a hot load variable)
ok @ShadowNinja
Diffstat (limited to 'src/server.cpp')
-rw-r--r-- | src/server.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/server.cpp b/src/server.cpp index a118e15dd..a75e27456 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -243,9 +243,6 @@ Server::Server( std::string ban_path = m_path_world + DIR_DELIM "ipban.txt"; m_banmanager = new BanManager(ban_path); - // Create rollback manager - m_rollback = new RollbackManager(m_path_world, this); - ModConfiguration modconf(m_path_world); m_mods = modconf.getMods(); std::vector<ModSpec> unsatisfied_mods = modconf.getUnsatisfiedMods(); @@ -353,6 +350,12 @@ Server::Server( // Initialize mapgens m_emerge->initMapgens(); + m_enable_rollback_recording = g_settings->getBool("enable_rollback_recording"); + if (m_enable_rollback_recording) { + // Create rollback manager + m_rollback = new RollbackManager(m_path_world, this); + } + // Give environment reference to scripting api m_script->initializeEnvironment(m_env); @@ -1068,10 +1071,6 @@ void Server::AsyncRunStep(bool initial_step) counter = 0.0; m_emerge->startThreads(); - - // Update m_enable_rollback_recording here too - m_enable_rollback_recording = - g_settings->getBool("enable_rollback_recording"); } } |