Fix map parameter load order

2014-12-30 12:30:14 -05:00 · 2014-12-30 12:30:14 -05:00 · a3d7203be5
parent 3d29be24e0
commit a3d7203be5
1 changed files with 4 additions and 2 deletions
--- 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;