From de90495eda57c233823a2ea3185ceb79994c5eea Mon Sep 17 00:00:00 2001
From: Lars <larsh@apache.org>
Date: Sun, 18 May 2025 10:34:46 -0700
Subject: [PATCH] Make sure monoblocks account for all node params

---
 src/mapblock.cpp | 10 ++++++++--
 src/mapblock.h   |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index aef3349b2..9dbd63cc4 100644
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -232,6 +232,13 @@ void MapBlock::copyFrom(const VoxelManipulator &src)
 	src.copyTo(data, data_area, v3s16(0,0,0),
 			getPosRelative(), data_size);
 
+	checkForMonoblock();
+}
+
+void MapBlock::checkForMonoblock() {
+	if (m_is_mono_block)
+		return;
+
 	MapNode n = data[0];
 	bool is_mono_block = true;
 	for (u32 i=1; i<nodecount; i++) {
@@ -628,8 +635,7 @@ void MapBlock::deSerialize(std::istream &in_compressed, u8 version, bool disk)
 		}
 
 		if (nimap.size() == 1) {
-			m_is_mono_block = true;
-			reallocate(1, data[0]);
+			checkForMonoblock();
 			u16 dummy;
 			if (nimap.getId("air", dummy)) {
 				m_is_air = true;
diff --git a/src/mapblock.h b/src/mapblock.h
index c588e43c3..debeb52fe 100644
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -449,6 +449,7 @@ private:
 	*/
 
 	void deSerialize_pre22(std::istream &is, u8 version, bool disk);
+	void checkForMonoblock();
 
 	void reallocate(u32 c, MapNode n)
 	{