summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/serverenvironment.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
index d3b85a430..41cd63684 100644
--- a/src/serverenvironment.cpp
+++ b/src/serverenvironment.cpp
@@ -2146,6 +2146,12 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
continue;
}
+ // If it's a forced delete, there are too many objects in mapblock
+ // Ignore players, they should not be removed on force delete
+ if (force_delete && obj->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
+ continue;
+ }
+
verbosestream<<"ServerEnvironment::deactivateFarObjects(): "
<<"object id="<<id<<" is not known by clients"
<<"; deleting"<<std::endl;