From: Jude Melton-Houghton <jwmhjwmh@gmail.com>
Date: Sat, 8 Oct 2022 14:25:22 +0000 (-0400)
Subject: Make MapEditEvent more complete
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=7701e70dc92262c41d68cf1c9f7fbd0c333e5c52;p=minetest.git

Make MapEditEvent more complete

SetBlocksNotSent is no longer used.
---

diff --git a/src/emerge.cpp b/src/emerge.cpp
index d58323ed5..34c13cbd5 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -722,8 +722,15 @@ void *EmergeThread::run()
 		if (block)
 			modified_blocks[pos] = block;
 
-		if (!modified_blocks.empty())
-			m_server->SetBlocksNotSent(modified_blocks);
+		if (!modified_blocks.empty()) {
+			MapEditEvent event;
+			event.type = MEET_OTHER;
+			for (const auto &pair : modified_blocks) {
+				event.modified_blocks.insert(pair.first);
+			}
+			MutexAutoLock envlock(m_server->m_env_mutex);
+			m_map->dispatchEvent(event);
+		}
 		modified_blocks.clear();
 	}
 	} catch (VersionMismatchException &e) {
diff --git a/src/map.h b/src/map.h
index 363da6076..e04958871 100644
--- a/src/map.h
+++ b/src/map.h
@@ -79,21 +79,21 @@ struct MapEditEvent
 
 	MapEditEvent() = default;
 
+	// Sets the event's position and marks the block as modified.
+	void setPositionModified(v3s16 pos)
+	{
+		p = pos;
+		modified_blocks.insert(getNodeBlockPos(pos));
+	}
+
 	VoxelArea getArea() const
 	{
 		switch(type){
 		case MEET_ADDNODE:
-			return VoxelArea(p);
 		case MEET_REMOVENODE:
-			return VoxelArea(p);
 		case MEET_SWAPNODE:
-			return VoxelArea(p);
 		case MEET_BLOCK_NODE_METADATA_CHANGED:
-		{
-			v3s16 np1 = p*MAP_BLOCKSIZE;
-			v3s16 np2 = np1 + v3s16(1,1,1)*MAP_BLOCKSIZE - v3s16(1,1,1);
-			return VoxelArea(np1, np2);
-		}
+			return VoxelArea(p);
 		case MEET_OTHER:
 		{
 			VoxelArea a;
diff --git a/src/rollback_interface.cpp b/src/rollback_interface.cpp
index c00206e98..6f19f441d 100644
--- a/src/rollback_interface.cpp
+++ b/src/rollback_interface.cpp
@@ -175,7 +175,7 @@ bool RollbackAction::applyRevert(Map *map, InventoryManager *imgr, IGameDef *gam
 				// Inform other things that the meta data has changed
 				MapEditEvent event;
 				event.type = MEET_BLOCK_NODE_METADATA_CHANGED;
-				event.p = p;
+				event.setPositionModified(p);
 				map->dispatchEvent(event);
 			} catch (InvalidPositionException &e) {
 				infostream << "RollbackAction::applyRevert(): "
diff --git a/src/script/lua_api/l_nodemeta.cpp b/src/script/lua_api/l_nodemeta.cpp
index f4edc1790..f1a2d5c4b 100644
--- a/src/script/lua_api/l_nodemeta.cpp
+++ b/src/script/lua_api/l_nodemeta.cpp
@@ -66,7 +66,7 @@ void NodeMetaRef::reportMetadataChange(const std::string *name)
 
 	MapEditEvent event;
 	event.type = MEET_BLOCK_NODE_METADATA_CHANGED;
-	event.p = m_p;
+	event.setPositionModified(m_p);
 	event.is_private_change = name && meta && meta->isPrivate(*name);
 	m_env->getMap().dispatchEvent(event);
 }
diff --git a/src/server.cpp b/src/server.cpp
index fb2e0db95..a20e82856 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -696,11 +696,13 @@ void Server::AsyncRunStep(bool initial_step)
 		std::map<v3s16, MapBlock*> modified_blocks;
 		m_env->getServerMap().transformLiquids(modified_blocks, m_env);
 
-		/*
-			Set the modified blocks unsent for all the clients
-		*/
 		if (!modified_blocks.empty()) {
-			SetBlocksNotSent(modified_blocks);
+			MapEditEvent event;
+			event.type = MEET_OTHER;
+			for (const auto &pair : modified_blocks) {
+				event.modified_blocks.insert(pair.first);
+			}
+			m_env->getMap().dispatchEvent(event);
 		}
 	}
 	m_clients.step(dtime);
@@ -1253,17 +1255,6 @@ void Server::onMapEditEvent(const MapEditEvent &event)
 	m_unsent_map_edit_queue.push(new MapEditEvent(event));
 }
 
-void Server::SetBlocksNotSent(std::map<v3s16, MapBlock *>& block)
-{
-	std::vector<session_t> clients = m_clients.getClientIDs();
-	ClientInterface::AutoLock clientlock(m_clients);
-	// Set the modified blocks unsent for all the clients
-	for (const session_t client_id : clients) {
-			if (RemoteClient *client = m_clients.lockedGetClientNoEx(client_id))
-				client->SetBlocksNotSent(block);
-	}
-}
-
 void Server::peerAdded(con::Peer *peer)
 {
 	verbosestream<<"Server::peerAdded(): peer->id="
diff --git a/src/server.h b/src/server.h
index 365fdf625..168680694 100644
--- a/src/server.h
+++ b/src/server.h
@@ -439,9 +439,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 	void SendNodeDef(session_t peer_id, const NodeDefManager *nodedef,
 		u16 protocol_version);
 
-	/* mark blocks not sent for all clients */
-	void SetBlocksNotSent(std::map<v3s16, MapBlock *>& block);
-
 
 	virtual void SendChatMessage(session_t peer_id, const ChatMessage &message);
 	void SendTimeOfDay(session_t peer_id, u16 time, f32 time_speed);
diff --git a/src/server/serverinventorymgr.cpp b/src/server/serverinventorymgr.cpp
index 63d1645cb..b29bf95a5 100644
--- a/src/server/serverinventorymgr.cpp
+++ b/src/server/serverinventorymgr.cpp
@@ -95,7 +95,7 @@ void ServerInventoryManager::setInventoryModified(const InventoryLocation &loc)
 	case InventoryLocation::NODEMETA: {
 		MapEditEvent event;
 		event.type = MEET_BLOCK_NODE_METADATA_CHANGED;
-		event.p = loc.p;
+		event.setPositionModified(loc.p);
 		m_env->getMap().dispatchEvent(event);
 	} break;
 	case InventoryLocation::DETACHED: {