From de664b1c6d4b2bca47f918a6a865a920434bf664 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Sat, 4 Feb 2017 13:31:21 +0100
Subject: [PATCH] Fix PlayerSAO deletion warning
 (0eede97af2927dcda3545192403b0a44f30bcd1f)

---
 src/serverenvironment.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
index 7a5cfafd6..8d86a4e0a 100644
--- a/src/serverenvironment.cpp
+++ b/src/serverenvironment.cpp
@@ -2087,9 +2087,7 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
 
 			if(block)
 			{
-				// Force delete object if mapblock is full, but ignore players
-				if (obj->getType() != ACTIVEOBJECT_TYPE_PLAYER &&
-					block->m_static_objects.m_stored.size() >= g_settings->getU16("max_objects_per_block")) {
+				if (block->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 "
@@ -2149,6 +2147,13 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
 			continue;
 		}
 
+		if (!force_delete && obj->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
+			warningstream << "ServerEnvironment::deactivateFarObjects(): "
+				<< "Trying to delete player object, THIS SHOULD NEVER HAPPEN!"
+				<< std::endl;
+			continue;
+		}
+
 		verbosestream<<"ServerEnvironment::deactivateFarObjects(): "
 			<<"object id="<<id<<" is not known by clients"
 			<<"; deleting"<<std::endl;