aboutsummaryrefslogtreecommitdiff
path: root/src/server.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-06-26 21:53:11 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-06-26 21:53:11 +0300
commit3fccc67eb7c530c280e9b496e22288ffa772152d (patch)
tree3272f5ec9b197dda47751401679747fe2785a8dd /src/server.cpp
parentd702a2c33b975a4763f6831a0ba5d8fce110c8f9 (diff)
downloadhax-minetest-server-3fccc67eb7c530c280e9b496e22288ffa772152d.tar.gz
hax-minetest-server-3fccc67eb7c530c280e9b496e22288ffa772152d.zip
fixed block unloading from memory (a better fix coming next)
Diffstat (limited to '')
-rw-r--r--src/server.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/server.cpp b/src/server.cpp
index 2ee94f345..b65f0bdb5 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1831,17 +1831,21 @@ void Server::AsyncRunStep()
JMutexAutoLock lock(m_env_mutex);
if(((ServerMap*)(&m_env.getMap()))->isSavingEnabled() == true)
{
+ // Unload unused data (delete from memory)
+ m_env.getMap().unloadUnusedData(
+ g_settings.getFloat("server_unload_unused_sectors_timeout"));
+ /*u32 deleted_count = m_env.getMap().unloadUnusedData(
+ g_settings.getFloat("server_unload_unused_sectors_timeout"));
+ */
+
// Save only changed parts
m_env.getMap().save(true);
- // Delete unused sectors
- u32 deleted_count = m_env.getMap().unloadUnusedData(
- g_settings.getFloat("server_unload_unused_sectors_timeout"));
- if(deleted_count > 0)
+ /*if(deleted_count > 0)
{
dout_server<<"Server: Unloaded "<<deleted_count
- <<" sectors from memory"<<std::endl;
- }
+ <<" blocks from memory"<<std::endl;
+ }*/
// Save players
m_env.serializePlayers(m_mapsavedir);