Core/Collision: Fix race conditions in mmaps

Fix a race condition in MMapManager happening whenever a map was unloaded. GridUnload enabled was required to trigger the race condition.

(cherry picked from commit aa042e94c2f76e5735a8f745c3fcb7dd54cf6c0b)

Conflicts:
	src/server/collision/Management/MMapManager.cpp
	src/server/collision/Management/MMapManager.h

1 files changed, 4 insertions, 1 deletions

diff --git a/src/server/collision/Management/MMapManager.h b/src/server/collision/Management/MMapManager.h
index b7356716a9d..2b3818601af 100644
--- a/src/server/collision/Management/MMapManager.h
+++ b/src/server/collision/Management/MMapManager.h
@@ -92,9 +92,10 @@ namespace MMAP
     class MMapManager
     {
         public:
-            MMapManager() : loadedTiles(0) { }
+            MMapManager() : loadedTiles(0), thread_safe_environment(true) {}
             ~MMapManager();
 
+            void InitializeThreadUnsafe(const std::vector<uint32>& mapIds);
             bool loadMap(const std::string& basePath, uint32 mapId, int32 x, int32 y);
             bool unloadMap(uint32 mapId, int32 x, int32 y);
             bool unloadMap(uint32 mapId);
@@ -115,8 +116,10 @@ namespace MMAP
             bool loadMapData(uint32 mapId);
             uint32 packTileID(int32 x, int32 y);
 
+            MMapDataSet::const_iterator GetMMapData(uint32 mapId) const;
             MMapDataSet loadedMMaps;
             uint32 loadedTiles;
+            bool thread_safe_environment;
 
             PhasedTile* LoadTile(uint32 mapId, int32 x, int32 y);
             PhaseTileMap _phaseTiles;