Performance fixes.

[oweals/minetest.git] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index 07f808202d442501c0066b944de9d89f8cc04d27..c948427ad559b3c584f1f8910f39a43d9c87cb21 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -295,10 +295,12 @@ Server::Server(
        // Lock environment
        JMutexAutoLock envlock(m_env_mutex);
 
-       // Create the Map and load parameters
-       ServerMap *servermap = new ServerMap(path_world, this, m_emerge);
+       // Load mapgen params from Settings
        m_emerge->loadMapgenParams();
 
+       // Create the Map (loads map_meta.txt, overriding configured mapgen params)
+       ServerMap *servermap = new ServerMap(path_world, this, m_emerge);
+
        // Initialize scripting
        infostream<<"Server: Initializing Lua"<<std::endl;
 
@@ -338,6 +340,8 @@ Server::Server(
        // Apply item aliases in the node definition manager
        m_nodedef->updateAliases(m_itemdef);
 
+       m_nodedef->setNodeRegistrationStatus(true);
+
        // Perform pending node name resolutions
        m_nodedef->runNodeResolverCallbacks();
 
@@ -1504,7 +1508,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
                                                <<"tried to connect from "<<addr_s<<" "
                                                <<"but it was disallowed for the following reason: "
                                                <<reason<<std::endl;
-                               DenyAccess(peer_id, narrow_to_wide(reason.c_str()));
+                               DenyAccess(peer_id, narrow_to_wide(reason));
                                return;
                        }
                }