Send proper block to old clients for swap_node calls

est31 · est31 · commit 94f1e5d9bdd3 · 2015-09-17T20:23:31.000+02:00
The legacy code added in commit d879a53 - "Add minetest.swap_node" for sending the whole mapblock to older clients on the case of a node modification with swap_node, had the problem that the block chosen to be sent to the client was referenced with node coordinates and not with block coordinates, resulting in getting the wrong block sent to the client.
diff --git a/src/server.cpp b/src/server.cpp
@@ -2102,7 +2102,7 @@ void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id,
 				if (client->net_proto_version <= 21) {
 					// Old clients always clear metadata; fix it
 					// by sending the full block again.
-					client->SetBlockNotSent(p);
+					client->SetBlockNotSent(getNodeBlockPos(p));
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -2102,7 +2102,7 @@ void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id,`
`2102`	`2102`	`if (client->net_proto_version <= 21) {`
`2103`	`2103`	`// Old clients always clear metadata; fix it`
`2104`	`2104`	`// by sending the full block again.`
`2105`		`- client->SetBlockNotSent(p);`
	`2105`	`+ client->SetBlockNotSent(getNodeBlockPos(p));`
`2106`	`2106`	`}`
`2107`	`2107`	`}`
`2108`	`2108`	`}`