X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserverenvironment.cpp;h=0a83c4a38e421db8efd9531fe501c4067d990464;hb=242c9bc36e490daee0fbe74da1feae3fefa76579;hp=b25840528880d77f59efc50054cbe9f4f24c2360;hpb=07177190734b0e5c17be18d0bf5d509c5226af2f;p=dragonfireclient.git

diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
index b25840528..0a83c4a38 100644
--- a/src/serverenvironment.cpp
+++ b/src/serverenvironment.cpp
@@ -396,36 +396,62 @@ ServerEnvironment::ServerEnvironment(ServerMap *map,
 	// Determine which database backend to use
 	std::string conf_path = path_world + DIR_DELIM + "world.mt";
 	Settings conf;
+
+	std::string player_backend_name = "sqlite3";
+	std::string auth_backend_name = "sqlite3";
+
 	bool succeeded = conf.readConfigFile(conf_path.c_str());
-	if (!succeeded || !conf.exists("player_backend")) {
-		// fall back to files
-		conf.set("player_backend", "files");
-		warningstream << "/!\\ You are using old player file backend. "
-				<< "This backend is deprecated and will be removed in next release /!\\"
-				<< std::endl << "Switching to SQLite3 or PostgreSQL is advised, "
-				<< "please read http://wiki.minetest.net/Database_backends." << std::endl;
 
-		if (!conf.updateConfigFile(conf_path.c_str())) {
-			errorstream << "ServerEnvironment::ServerEnvironment(): "
-				<< "Failed to update world.mt!" << std::endl;
+	// If we open world.mt read the backend configurations.
+	if (succeeded) {
+		// Read those values before setting defaults
+		bool player_backend_exists = conf.exists("player_backend");
+		bool auth_backend_exists = conf.exists("auth_backend");
+
+		// player backend is not set, assume it's legacy file backend.
+		if (!player_backend_exists) {
+			// fall back to files
+			conf.set("player_backend", "files");
+			player_backend_name = "files";
+
+			if (!conf.updateConfigFile(conf_path.c_str())) {
+				errorstream << "ServerEnvironment::ServerEnvironment(): "
+						<< "Failed to update world.mt!" << std::endl;
+			}
+		} else {
+			conf.getNoEx("player_backend", player_backend_name);
 		}
-	}
 
-	std::string name;
-	conf.getNoEx("player_backend", name);
-	m_player_database = openPlayerDatabase(name, path_world, conf);
+		// auth backend is not set, assume it's legacy file backend.
+		if (!auth_backend_exists) {
+			conf.set("auth_backend", "files");
+			auth_backend_name = "files";
 
-	std::string auth_name = "files";
-	if (conf.exists("auth_backend")) {
-		conf.getNoEx("auth_backend", auth_name);
-	} else {
-		conf.set("auth_backend", "files");
-		if (!conf.updateConfigFile(conf_path.c_str())) {
-			errorstream << "ServerEnvironment::ServerEnvironment(): "
-					<< "Failed to update world.mt!" << std::endl;
+			if (!conf.updateConfigFile(conf_path.c_str())) {
+				errorstream << "ServerEnvironment::ServerEnvironment(): "
+						<< "Failed to update world.mt!" << std::endl;
+			}
+		} else {
+			conf.getNoEx("auth_backend", auth_backend_name);
 		}
 	}
-	m_auth_database = openAuthDatabase(auth_name, path_world, conf);
+
+	if (player_backend_name == "files") {
+		warningstream << "/!\\ You are using old player file backend. "
+				<< "This backend is deprecated and will be removed in a future release /!\\"
+				<< std::endl << "Switching to SQLite3 or PostgreSQL is advised, "
+				<< "please read http://wiki.minetest.net/Database_backends." << std::endl;
+	}
+
+	if (auth_backend_name == "files") {
+		warningstream << "/!\\ You are using old auth file backend. "
+				<< "This backend is deprecated and will be removed in a future release /!\\"
+				<< std::endl << "Switching to SQLite3 is advised, "
+				<< "please read http://wiki.minetest.net/Database_backends." << std::endl;
+	}
+
+	m_player_database = openPlayerDatabase(player_backend_name, path_world, conf);
+	m_auth_database = openAuthDatabase(auth_backend_name, path_world, conf);
 }
 
 ServerEnvironment::~ServerEnvironment()
@@ -542,10 +568,10 @@ void ServerEnvironment::kickAllPlayers(AccessDeniedCode reason,
 	}
 }
 
-void ServerEnvironment::saveLoadedPlayers()
+void ServerEnvironment::saveLoadedPlayers(bool force)
 {
 	for (RemotePlayer *player : m_players) {
-		if (player->checkModified() || (player->getPlayerSAO() &&
+		if (force || player->checkModified() || (player->getPlayerSAO() &&
 				player->getPlayerSAO()->getMeta().isModified())) {
 			try {
 				m_player_database->savePlayer(player);
@@ -2123,7 +2149,7 @@ bool ServerEnvironment::migratePlayersDatabase(const GameParams &game_params,
 		delete dstdb;
 
 	} catch (BaseException &e) {
-		errorstream << "An error occured during migration: " << e.what() << std::endl;
+		errorstream << "An error occurred during migration: " << e.what() << std::endl;
 		return false;
 	}
 	return true;
@@ -2210,7 +2236,7 @@ bool ServerEnvironment::migrateAuthDatabase(
 		}
 
 	} catch (BaseException &e) {
-		errorstream << "An error occured during migration: " << e.what()
+		errorstream << "An error occurred during migration: " << e.what()
 			    << std::endl;
 		return false;
 	}