5 files changed, 18 insertions, 26 deletions

diff --git a/src/server/game/Maps/DynamicMMapTileBuilder.cpp b/src/server/game/Maps/DynamicMMapTileBuilder.cpp
index 49205597853..984dc4a7edc 100644
--- a/src/server/game/Maps/DynamicMMapTileBuilder.cpp
+++ b/src/server/game/Maps/DynamicMMapTileBuilder.cpp
@@ -165,7 +165,7 @@ struct TileCache
 private:
     void OnCacheCleanupTimerTick(boost::system::error_code const& error)
     {
-        if (error)
+        if (error || !_builderThread.joinable() /*shutting down*/)
             return;
 
         TimePoint now = GameTime::Now();
@@ -176,7 +176,7 @@ private:
 
     void RemoveOldCacheEntries(TimePoint oldestPreservedEntryTimestamp)
     {
-        std::lock_guard lock(TilesMutex);
+        std::scoped_lock lock(TilesMutex);
         Trinity::Containers::EraseIf(Tiles, [=](std::unordered_map<TileCacheKey, Tile>::value_type const& kv)
         {
             return kv.second.LastAccessed < oldestPreservedEntryTimestamp;
@@ -306,7 +306,7 @@ std::weak_ptr<DynamicTileBuilder::AsyncTileResult> DynamicTileBuilder::BuildTile
     cacheKey.CachedHash = std::hash<TileCacheKey>::Compute(cacheKey);
 
     TileCache* tileCache = TileCache::Instance();
-    std::lock_guard lock(tileCache->TilesMutex);
+    std::scoped_lock lock(tileCache->TilesMutex);
     auto [itr, isNew] = tileCache->Tiles.try_emplace(std::move(cacheKey));
     itr->second.LastAccessed = GameTime::Now();
     if (!isNew)
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index bc3a8c1c154..d363349febe 100644
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -163,7 +163,7 @@ Map* MapManager::CreateMap(uint32 mapId, Player* player, Optional<uint32> lfgDun
     if (!entry)
         return nullptr;
 
-    std::unique_lock<std::shared_mutex> lock(_mapsLock);
+    std::scoped_lock lock(_mapsLock);
 
     Map* map = nullptr;
     uint32 newInstanceId = 0;                       // instanceId of the resulting map
diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp
index 33d36126b6d..7a2c9a5afb9 100644
--- a/src/server/game/Maps/MapUpdater.cpp
+++ b/src/server/game/Maps/MapUpdater.cpp
@@ -20,8 +20,6 @@
 #include "Map.h"
 #include "Metric.h"
 
-#include <mutex>
-
 class MapUpdateRequest
 {
     private:
@@ -48,9 +46,7 @@ class MapUpdateRequest
 void MapUpdater::activate(size_t num_threads)
 {
     for (size_t i = 0; i < num_threads; ++i)
-    {
-        _workerThreads.push_back(std::thread(&MapUpdater::WorkerThread, this));
-    }
+        _workerThreads.emplace_back(&MapUpdater::WorkerThread, this);
 }
 
 void MapUpdater::deactivate()
@@ -62,38 +58,33 @@ void MapUpdater::deactivate()
     _queue.Cancel();
 
     for (auto& thread : _workerThreads)
-    {
         thread.join();
-    }
 }
 
 void MapUpdater::wait()
 {
-    std::unique_lock<std::mutex> lock(_lock);
-
-    while (pending_requests > 0)
-        _condition.wait(lock);
+    std::unique_lock lock(_lock);
 
-    lock.unlock();
+    _condition.wait(lock, [&] { return pending_requests == 0; });
 }
 
 void MapUpdater::schedule_update(Map& map, uint32 diff)
 {
-    std::lock_guard<std::mutex> lock(_lock);
+    std::scoped_lock lock(_lock);
 
     ++pending_requests;
 
     _queue.Push(new MapUpdateRequest(map, *this, diff));
 }
 
-bool MapUpdater::activated()
+bool MapUpdater::activated() const
 {
-    return _workerThreads.size() > 0;
+    return !_workerThreads.empty();
 }
 
 void MapUpdater::update_finished()
 {
-    std::lock_guard<std::mutex> lock(_lock);
+    std::scoped_lock lock(_lock);
 
     --pending_requests;
 
@@ -107,7 +98,7 @@ void MapUpdater::WorkerThread()
     WorldDatabase.WarnAboutSyncQueries(true);
     HotfixDatabase.WarnAboutSyncQueries(true);
 
-    while (1)
+    while (true)
     {
         MapUpdateRequest* request = nullptr;
 
diff --git a/src/server/game/Maps/MapUpdater.h b/src/server/game/Maps/MapUpdater.h
index 33858bb8ea1..14afdf63974 100644
--- a/src/server/game/Maps/MapUpdater.h
+++ b/src/server/game/Maps/MapUpdater.h
@@ -19,10 +19,11 @@
 #define _MAP_UPDATER_H_INCLUDED
 
 #include "Define.h"
+#include "ProducerConsumerQueue.h"
+#include <condition_variable>
 #include <mutex>
 #include <thread>
-#include <condition_variable>
-#include "ProducerConsumerQueue.h"
+#include <vector>
 
 class MapUpdateRequest;
 class Map;
@@ -44,7 +45,7 @@ class TC_GAME_API MapUpdater
 
         void deactivate();
 
-        bool activated();
+        bool activated() const;
 
     private:
 
diff --git a/src/server/game/Maps/TerrainMgr.cpp b/src/server/game/Maps/TerrainMgr.cpp
index 4233f08e072..b0afc102fa4 100644
--- a/src/server/game/Maps/TerrainMgr.cpp
+++ b/src/server/game/Maps/TerrainMgr.cpp
@@ -158,7 +158,7 @@ void TerrainInfo::LoadMapAndVMap(int32 gx, int32 gy)
     if (++_referenceCountFromMap[gx][gy] != 1)    // check if already loaded
         return;
 
-    std::lock_guard<std::mutex> lock(_loadMutex);
+    std::scoped_lock lock(_loadMutex);
     LoadMapAndVMapImpl(gx, gy);
 }
 
@@ -301,7 +301,7 @@ GridMap* TerrainInfo::GetGrid(uint32 mapId, float x, float y, bool loadIfMissing
     // ensure GridMap is loaded
     if (!(_loadedGrids[gx] & (UI64LIT(1) << gy)) && loadIfMissing)
     {
-        std::lock_guard<std::mutex> lock(_loadMutex);
+        std::scoped_lock lock(_loadMutex);
         LoadMapAndVMapImpl(gx, gy);
     }