summaryrefslogtreecommitdiff
path: root/src/server.cpp
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2015-03-13 04:35:34 +0100
committerShadowNinja <shadowninja@minetest.net>2015-03-18 13:03:02 -0400
commit538036d004f914f31c276090d7735d61139fc58e (patch)
tree6d8d067c49d2c96dfa9469798150a02e0bd594c4 /src/server.cpp
parent467fc0ddc912ae38c3bf9fcb99e0b66d7478eec0 (diff)
downloadminetest-538036d004f914f31c276090d7735d61139fc58e.tar.gz
minetest-538036d004f914f31c276090d7735d61139fc58e.tar.bz2
minetest-538036d004f914f31c276090d7735d61139fc58e.zip
Fix game minetest.conf default settings
This was a regression introduced by f6e4c5d9cf459e8278a76a2beaee59732e841458 .
Diffstat (limited to 'src/server.cpp')
-rw-r--r--src/server.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server.cpp b/src/server.cpp
index 235e802bb..52183980f 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -223,7 +223,7 @@ Server::Server(
infostream<<"- game: "<<m_gamespec.path<<std::endl;
// Create world if it doesn't exist
- if(!initializeWorld(m_path_world, m_gamespec.id))
+ if(!loadGameConfAndInitWorld(m_path_world, m_gamespec))
throw ServerError("Failed to initialize world");
// Create server thread