Initialize world before creating BanManager and RollbackManager

This commit is contained in:
ShadowNinja 2013-12-30 14:29:33 -05:00
parent 829426c714
commit 2902a29c2d

@ -703,6 +703,10 @@ Server::Server(
// Create emerge manager // Create emerge manager
m_emerge = new EmergeManager(this); 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 // Create ban manager
std::string ban_path = m_path_world+DIR_DELIM+"ipban.txt"; std::string ban_path = m_path_world+DIR_DELIM+"ipban.txt";
m_banmanager = new BanManager(ban_path); m_banmanager = new BanManager(ban_path);
@ -711,10 +715,6 @@ Server::Server(
std::string rollback_path = m_path_world+DIR_DELIM+"rollback.txt"; std::string rollback_path = m_path_world+DIR_DELIM+"rollback.txt";
m_rollback = createRollbackManager(rollback_path, this); 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); ModConfiguration modconf(m_path_world);
m_mods = modconf.getMods(); m_mods = modconf.getMods();
std::vector<ModSpec> unsatisfied_mods = modconf.getUnsatisfiedMods(); std::vector<ModSpec> unsatisfied_mods = modconf.getUnsatisfiedMods();