Force player save before kicking on player shutdown (#8157)

nerzhul · web-flow · commit 70672e1cb763 · 2019-02-03T09:11:45.000+01:00
diff --git a/src/server.cpp b/src/server.cpp
@@ -257,6 +257,7 @@ Server::~Server()
 		if (kick_msg.empty()) {
 			kick_msg = g_settings->get("kick_msg_shutdown");
 		}
+		m_env->saveLoadedPlayers(true);
 		m_env->kickAllPlayers(SERVER_ACCESSDENIED_SHUTDOWN,
 			kick_msg, reconnect);
 	}
diff --git 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);
diff --git a/src/serverenvironment.h b/src/serverenvironment.h
@@ -221,7 +221,7 @@ class ServerEnvironment : public Environment
 	void kickAllPlayers(AccessDeniedCode reason,
 		const std::string &str_reason, bool reconnect);
 	// Save players
-	void saveLoadedPlayers();
+	void saveLoadedPlayers(bool force = false);
 	void savePlayer(RemotePlayer *player);
 	PlayerSAO *loadPlayer(RemotePlayer *player, bool *new_player, session_t peer_id,
 		bool is_singleplayer);

Original file line number	Diff line number	Diff line change
`@@ -257,6 +257,7 @@ Server::~Server()`
`257`	`257`	`if (kick_msg.empty()) {`
`258`	`258`	`kick_msg = g_settings->get("kick_msg_shutdown");`
`259`	`259`	`}`
	`260`	`+ m_env->saveLoadedPlayers(true);`
`260`	`261`	`m_env->kickAllPlayers(SERVER_ACCESSDENIED_SHUTDOWN,`
`261`	`262`	`kick_msg, reconnect);`
`262`	`263`	`}`
Original file line number	Diff line number	Diff line change
`@@ -568,10 +568,10 @@ void ServerEnvironment::kickAllPlayers(AccessDeniedCode reason,`
`568`	`568`	`}`
`569`	`569`	`}`
`570`	`570`
`571`		`-void ServerEnvironment::saveLoadedPlayers()`
	`571`	`+void ServerEnvironment::saveLoadedPlayers(bool force)`
`572`	`572`	`{`
`573`	`573`	`for (RemotePlayer *player : m_players) {`
`574`		`- if (player->checkModified() \|\| (player->getPlayerSAO() &&`
	`574`	`+ if (force \|\| player->checkModified() \|\| (player->getPlayerSAO() &&`
`575`	`575`	`player->getPlayerSAO()->getMeta().isModified())) {`
`576`	`576`	`try {`
`577`	`577`	`m_player_database->savePlayer(player);`