From 63a3bb229a9ff288ab01e3e80c8477da5e84ee1e Mon Sep 17 00:00:00 2001 From: paramat Date: Wed, 19 Oct 2016 01:37:12 +0100 Subject: Changes to static object storage limit and error message Move static object storage force-delete message from errorstream to warningstream. Increase 'max objects per block' setting to 64. Add missing spaces in warning code. --- src/environment.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/environment.cpp') diff --git a/src/environment.cpp b/src/environment.cpp index ceaf40d89..ecda1b6a4 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -2175,13 +2175,13 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete) if(block) { - if(block->m_static_objects.m_stored.size() >= g_settings->getU16("max_objects_per_block")){ - errorstream<<"ServerEnv: Trying to store id="<getId() - <<" statically but block "<m_static_objects.m_stored.size() - <<" objects." - <<" Forcing delete."<m_static_objects.m_stored.size() >= g_settings->getU16("max_objects_per_block")) { + warningstream << "ServerEnv: Trying to store id = " << obj->getId() + << " statically but block " << PP(blockpos) + << " already contains " + << block->m_static_objects.m_stored.size() + << " objects." + << " Forcing delete." << std::endl; force_delete = true; } else { // If static counterpart already exists in target block, -- cgit v1.2.3