From a3d7203be5777010f13bf5465667028b920f4a29 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Tue, 30 Dec 2014 12:30:14 -0500 Subject: [PATCH] Fix map parameter load order --- src/server.cpp | 6 ++++-- 1 file 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"<