diff options
| author | kwolekr <kwolekr@minetest.net> | 2014-12-30 12:30:14 -0500 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-12-30 12:30:42 -0500 |
| commit | a3d7203be5777010f13bf5465667028b920f4a29 (patch) | |
| tree | 3bf4e2ac507f299c5043a20a56aed7a74ca93f14 | |
| parent | 3d29be24e089b1c267409f05b897ce3f03e99a07 (diff) | |
| download | minetest-a3d7203be5777010f13bf5465667028b920f4a29.tar.gz minetest-a3d7203be5777010f13bf5465667028b920f4a29.tar.bz2 minetest-a3d7203be5777010f13bf5465667028b920f4a29.zip | |
Fix map parameter load order
| -rw-r--r-- | src/server.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server.cpp b/src/server.cpp index 07f808202..d268276bb 100644 --- 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; |