diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2014-06-25 20:28:41 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2014-11-19 16:21:59 -0500 |
| commit | b1965ac20922e3722392114bd63a22b403dcbe98 (patch) | |
| tree | ab7ba20d23e01be920d7161fbfd20d2e265f2b70 /src/server.cpp | |
| parent | da0f1e5497c7dece9ff5092adfb5881b0dd2e10c (diff) | |
| download | minetest-b1965ac20922e3722392114bd63a22b403dcbe98.tar.gz minetest-b1965ac20922e3722392114bd63a22b403dcbe98.tar.bz2 minetest-b1965ac20922e3722392114bd63a22b403dcbe98.zip | |
Clean up rollback
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/server.cpp b/src/server.cpp index d1f3997e9..857114d0f 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -181,7 +181,6 @@ Server::Server( this), m_banmanager(NULL), m_rollback(NULL), - m_rollback_sink_enabled(true), m_enable_rollback_recording(false), m_emerge(NULL), m_script(NULL), @@ -241,12 +240,11 @@ Server::Server( throw ServerError("Failed to initialize world"); // Create ban manager - std::string ban_path = m_path_world+DIR_DELIM+"ipban.txt"; + std::string ban_path = m_path_world + DIR_DELIM "ipban.txt"; m_banmanager = new BanManager(ban_path); // Create rollback manager - std::string rollback_path = m_path_world+DIR_DELIM+"rollback.txt"; - m_rollback = createRollbackManager(rollback_path, this); + m_rollback = new RollbackManager(m_path_world, this); ModConfiguration modconf(m_path_world); m_mods = modconf.getMods(); @@ -4834,8 +4832,6 @@ bool Server::rollbackRevertActions(const std::list<RollbackAction> &actions, { infostream<<"Server::rollbackRevertActions(len="<<actions.size()<<")"<<std::endl; ServerMap *map = (ServerMap*)(&m_env->getMap()); - // Disable rollback report sink while reverting - BoolScopeSet rollback_scope_disable(&m_rollback_sink_enabled, false); // Fail if no actions to handle if(actions.empty()){ @@ -4915,14 +4911,6 @@ MtEventManager* Server::getEventManager() { return m_event; } -IRollbackReportSink* Server::getRollbackReportSink() -{ - if(!m_enable_rollback_recording) - return NULL; - if(!m_rollback_sink_enabled) - return NULL; - return m_rollback; -} IWritableItemDefManager* Server::getWritableItemDefManager() { |