1 files changed, 33 insertions, 0 deletions

diff --git a/src/SetChunkData.cpp b/src/SetChunkData.cpp
index af6ad1251..bfe59fbcb 100644
--- a/src/SetChunkData.cpp
+++ b/src/SetChunkData.cpp
@@ -5,6 +5,7 @@
 
 #include "Globals.h"
 #include "SetChunkData.h"
+#include "BlockEntities/BlockEntity.h"
 
 
 
@@ -116,3 +117,35 @@ void cSetChunkData::CalculateHeightMap(void)
 
 
 
+
+void cSetChunkData::RemoveInvalidBlockEntities(void)
+{
+	for (cBlockEntityList::iterator itr = m_BlockEntities.begin(); itr != m_BlockEntities.end();)
+	{
+		BLOCKTYPE EntityBlockType = (*itr)->GetBlockType();
+		BLOCKTYPE WorldBlockType = cChunkDef::GetBlock(m_BlockTypes, (*itr)->GetRelX(), (*itr)->GetPosY(), (*itr)->GetRelZ());
+		if (EntityBlockType != WorldBlockType)
+		{
+			// Bad blocktype, remove the block entity:
+			LOGD("Block entity blocktype mismatch at {%d, %d, %d}: entity for blocktype %s(%d) in block %s(%d). Deleting the block entity.",
+				(*itr)->GetPosX(), (*itr)->GetPosY(), (*itr)->GetPosZ(),
+				ItemTypeToString(EntityBlockType).c_str(), EntityBlockType,
+				ItemTypeToString(WorldBlockType).c_str(),  WorldBlockType
+			);
+			cBlockEntityList::iterator itr2 = itr;
+			itr2++;
+			delete *itr;
+			m_BlockEntities.erase(itr);
+			itr = itr2;
+		}
+		else
+		{
+			// Good blocktype, keep the block entity:
+			++itr;
+		}
+	}  // for itr - m_BlockEntities[]
+}
+
+
+
+