Fix --color command line parameter ignorance (#7173)

[oweals/minetest.git] / src / serverenvironment.cpp

diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
index 4e75a7c803f64a50c2b07c2a4e8ac8abd2aafabd..0a83c4a38e421db8efd9531fe501c4067d990464 100644 (file)
--- a/src/serverenvironment.cpp
+++ b/src/serverenvironment.cpp
@@ -568,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);
@@ -2149,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;
@@ -2236,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;
        }