Mapgen: Remove '#include treegen.h' from non-mgv6 mapgens

[minetest.git] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index 9ed2a045de53747ca5c2802cbf50e7dfb7419ee2..0daa610541dbed1253d253b00f43a5c228f7ffa6 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2147,14 +2147,6 @@ void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id,
                if (client != 0) {
                        pkt << p << n.param0 << n.param1 << n.param2
                                        << (u8) (remove_metadata ? 0 : 1);
-
-                       if (!remove_metadata) {
-                               if (client->net_proto_version <= 21) {
-                                       // Old clients always clear metadata; fix it
-                                       // by sending the full block again.
-                                       client->SetBlockNotSent(getNodeBlockPos(p));
-                               }
-                       }
                }
                m_clients.unlock();
 
@@ -2188,7 +2180,7 @@ void Server::SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver, u16 net_proto
 
        std::ostringstream os(std::ios_base::binary);
        block->serialize(os, ver, false);
-       block->serializeNetworkSpecific(os, net_proto_version);
+       block->serializeNetworkSpecific(os);
        std::string s = os.str();
 
        NetworkPacket pkt(TOCLIENT_BLOCKDATA, 2 + 2 + 2 + 2 + s.size(), peer_id);
@@ -3577,6 +3569,9 @@ void dedicated_server_loop(Server &server, bool &kill)
                }
                server.step(steplen);
 
+               if (server.getShutdownRequested() || kill)
+                       break;
+
                /*
                        Profiler
                */