1 files changed, 10 insertions, 0 deletions
diff --git a/src/map.h b/src/map.h
index 9a9586fc6..7893142b7 100644
--- a/src/map.h
+++ b/src/map.h
@@ -412,8 +412,15 @@ public:
 	// Database version
 	void loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool save_after_load=false);
 
+	// Blocks are removed from the map but not deleted from memory until
+	// deleteDetachedBlocks() is called, since pointers to them may still exist
+	// when deleteBlock() is called.
 	bool deleteBlock(v3s16 blockpos) override;
 
+	void deleteDetachedBlocks();
+
+	void step();
+
 	void updateVManip(v3s16 pos);
 
 	// For debug printing
@@ -457,6 +464,9 @@ private:
 
 	std::set<v3s16> m_chunks_in_progress;
 
+	// used by deleteBlock() and deleteDetachedBlocks()
+	MapBlockVect m_detached_blocks;
+
 	// Queued transforming water nodes
 	UniqueQueue<v3s16> m_transforming_liquid;
 	f32 m_transforming_liquid_loop_count_multiplier = 1.0f;