wip

proller · Oct 18, 2024 · 16f7118 · 16f7118
1 parent 32cd892
commit 16f7118
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/client/fm_client.cpp b/src/client/fm_client.cpp
@@ -98,7 +98,6 @@ void Client::handleCommand_FreeminerInit(NetworkPacket *pkt)
 	{
 		Settings settings;
 		packet[TOCLIENT_INIT_MAP_PARAMS].convert(settings);
-
 		std::string mg_name;
 		MapgenType mgtype = settings.getNoEx("mg_name", mg_name)
 									? Mapgen::getMapgenType(mg_name)
@@ -110,6 +109,8 @@ void Client::handleCommand_FreeminerInit(NetworkPacket *pkt)
 						<< Mapgen::getMapgenName(FARMESH_DEFAULT_MAPGEN) << std::endl;
 			mgtype = FARMESH_DEFAULT_MAPGEN;
 			far_container.use_weather = false;
+		} else {
+			far_container.have_params = true;
 		}
 
 		MakeEmerge(settings, mgtype);
@@ -234,7 +235,7 @@ void Client::handleCommand_BlockDataFm(NetworkPacket *pkt)
 		if (const auto db = GetFarDatabase({}, far_dbases, m_world_path, step); db) {
 			ServerMap::saveBlock(block.get(), db);
 
-			if (!step) {
+			if (!step && !far_container.have_params) {
 				merger->add_changed(bpos);
 			}
 		}

diff --git a/src/client/fm_far_container.h b/src/client/fm_far_container.h
@@ -13,6 +13,7 @@ class FarContainer : public NodeContainer
 public:
 	Mapgen *m_mg{};
 	bool use_weather {true};
+	bool have_params {};
 	FarContainer(Client *client);
 	const MapNode &getNodeRefUnsafe(const v3pos_t &p) override;
 };
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
@@ -350,7 +350,9 @@ void Client::handleCommand_BlockData(NetworkPacket* pkt)
 
 	if (m_localdb && !is_simple_singleplayer_game) {
 		ServerMap::saveBlock(block, m_localdb);
-		merger->add_changed(p);
+		if (!far_container.have_params) {
+			merger->add_changed(p);
+		}
 	}
 
 	/*