Fix #50 server crash

World::Players was accessed in a non-thread-safe way from the player saving thread.
Illarion-eV · Dec 3, 2020 · e6f9437 · e6f9437
1 parent b91fc82
commit e6f9437
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/PlayerManager.cpp b/src/PlayerManager.cpp
@@ -195,10 +195,6 @@ void PlayerManager::playerSaveLoop(PlayerManager *pmanager) {
                     std::lock_guard<std::mutex> lock(mut);
                     pmanager->loggedOutPlayers.pop_front();
                 }
-
-                Logger::debug(LogFacility::World) << "update player list [begin]" << Log::end;
-                world->updatePlayerList();
-                Logger::debug(LogFacility::World) << "update player list [end]" << Log::end;
             }
 
             using namespace std::chrono_literals;

diff --git a/src/World.cpp b/src/World.cpp
@@ -154,6 +154,10 @@ void World::checkPlayers() {
     for (const auto &player : lostPlayers) {
         Players.erase(player->getId());
     }
+
+    if (!lostPlayers.empty()) {
+        updatePlayerList();
+    }
 }
 
 void World::checkPlayerImmediateCommands() {