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 293b32a81595403fa7c9c269f5efc6c52718fed8..0daa610541dbed1253d253b00f43a5c228f7ffa6 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -148,11 +148,13 @@ Server::Server(
                const SubgameSpec &gamespec,
                bool simple_singleplayer_mode,
                bool ipv6,
+               bool dedicated,
                ChatInterface *iface
        ):
        m_path_world(path_world),
        m_gamespec(gamespec),
        m_simple_singleplayer_mode(simple_singleplayer_mode),
+       m_dedicated(dedicated),
        m_async_fatal_error(""),
        m_env(NULL),
        m_con(PROTOCOL_ID,
@@ -629,10 +631,10 @@ void Server::AsyncRunStep(bool initial_step)
        // send masterserver announce
        {
                float &counter = m_masterserver_timer;
-               if(!isSingleplayer() && (!counter || counter >= 300.0) &&
-                               g_settings->getBool("server_announce"))
-               {
-                       ServerList::sendAnnounce(counter ? "update" : "start",
+               if (!isSingleplayer() && (!counter || counter >= 300.0) &&
+                               g_settings->getBool("server_announce")) {
+                       ServerList::sendAnnounce(counter ? ServerList::AA_UPDATE :
+                                               ServerList::AA_START,
                                        m_bind_addr.getPort(),
                                        m_clients.getPlayerNames(),
                                        m_uptime.get(),
@@ -640,7 +642,8 @@ void Server::AsyncRunStep(bool initial_step)
                                        m_lag,
                                        m_gamespec.id,
                                        Mapgen::getMapgenName(m_emerge->mgparams->mgtype),
-                                       m_mods);
+                                       m_mods,
+                                       m_dedicated);
                        counter = 0.01;
                }
                counter += dtime;
@@ -2144,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();
 
@@ -2185,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);
@@ -3574,15 +3569,8 @@ void dedicated_server_loop(Server &server, bool &kill)
                }
                server.step(steplen);
 
-               if(server.getShutdownRequested() || kill)
-               {
-                       infostream<<"Dedicated server quitting"<<std::endl;
-#if USE_CURL
-                       if(g_settings->getBool("server_announce"))
-                               ServerList::sendAnnounce("delete", server.m_bind_addr.getPort());
-#endif
+               if (server.getShutdownRequested() || kill)
                        break;
-               }
 
                /*
                        Profiler
@@ -3596,4 +3584,11 @@ void dedicated_server_loop(Server &server, bool &kill)
                        }
                }
        }
+
+       infostream << "Dedicated server quitting" << std::endl;
+#if USE_CURL
+       if (g_settings->getBool("server_announce"))
+               ServerList::sendAnnounce(ServerList::AA_DELETE,
+                       server.m_bind_addr.getPort());
+#endif
 }