aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2013-12-30 14:29:33 -0500
committerShadowNinja <shadowninja@minetest.net>2013-12-30 14:29:33 -0500
commit2902a29c2d5cc54f1a5623613e91ddecc7fee2a2 (patch)
tree3ea30eafa70df71da2855c3287b9764369880d0b
parent829426c71456f9980f42ebd5435c5eee6615dd6f (diff)
downloadminetest-2902a29c2d5cc54f1a5623613e91ddecc7fee2a2.tar.gz
minetest-2902a29c2d5cc54f1a5623613e91ddecc7fee2a2.tar.bz2
minetest-2902a29c2d5cc54f1a5623613e91ddecc7fee2a2.zip
Initialize world before creating BanManager and RollbackManager
-rw-r--r--src/server.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server.cpp b/src/server.cpp
index c1cedf0f3..09c2ca663 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -703,6 +703,10 @@ Server::Server(
// Create emerge manager
m_emerge = new EmergeManager(this);
+ // Create world if it doesn't exist
+ if(!initializeWorld(m_path_world, m_gamespec.id))
+ throw ServerError("Failed to initialize world");
+
// Create ban manager
std::string ban_path = m_path_world+DIR_DELIM+"ipban.txt";
m_banmanager = new BanManager(ban_path);
@@ -711,10 +715,6 @@ Server::Server(
std::string rollback_path = m_path_world+DIR_DELIM+"rollback.txt";
m_rollback = createRollbackManager(rollback_path, this);
- // Create world if it doesn't exist
- if(!initializeWorld(m_path_world, m_gamespec.id))
- throw ServerError("Failed to initialize world");
-
ModConfiguration modconf(m_path_world);
m_mods = modconf.getMods();
std::vector<ModSpec> unsatisfied_mods = modconf.getUnsatisfiedMods();