MoNTE48
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Loïc Blot 2019-02-03 09:11:45 +01:00 committed by GitHub
parent 23ea02c79c
commit 70672e1cb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/server.cpp
View File

@ -257,6 +257,7 @@ Server::~Server()
if (kick_msg.empty()) { if (kick_msg.empty()) {
kick_msg = g_settings->get("kick_msg_shutdown"); kick_msg = g_settings->get("kick_msg_shutdown");
} }
m_env->saveLoadedPlayers(true);
m_env->kickAllPlayers(SERVER_ACCESSDENIED_SHUTDOWN, m_env->kickAllPlayers(SERVER_ACCESSDENIED_SHUTDOWN,
kick_msg, reconnect); kick_msg, reconnect);
} }

4
src/serverenvironment.cpp
View File

@ -568,10 +568,10 @@ void ServerEnvironment::kickAllPlayers(AccessDeniedCode reason,
} }
} }
void ServerEnvironment::saveLoadedPlayers() void ServerEnvironment::saveLoadedPlayers(bool force)
{ {
for (RemotePlayer *player : m_players) { for (RemotePlayer *player : m_players) {
if (player->checkModified() || (player->getPlayerSAO() && if (force || player->checkModified() || (player->getPlayerSAO() &&
player->getPlayerSAO()->getMeta().isModified())) { player->getPlayerSAO()->getMeta().isModified())) {
try { try {
m_player_database->savePlayer(player); m_player_database->savePlayer(player);

2
src/serverenvironment.h
View File

@ -221,7 +221,7 @@ public:
void kickAllPlayers(AccessDeniedCode reason, void kickAllPlayers(AccessDeniedCode reason,
const std::string &str_reason, bool reconnect); const std::string &str_reason, bool reconnect);
// Save players // Save players
void saveLoadedPlayers(); void saveLoadedPlayers(bool force = false);
void savePlayer(RemotePlayer *player); void savePlayer(RemotePlayer *player);
PlayerSAO *loadPlayer(RemotePlayer *player, bool *new_player, session_t peer_id, PlayerSAO *loadPlayer(RemotePlayer *player, bool *new_player, session_t peer_id,
bool is_singleplayer); bool is_singleplayer);