Do not force deletion of players when mapblock is full (#5081)

This fixes #4067
minetest · Jan 21, 2017 · 2ea6015 · 2ea6015
1 parent 0dada51
commit 2ea6015
Showing 1 changed file with 6 additions and 0 deletions.
diff --git 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;