diff options
| -rw-r--r-- | src/server/game/Battlegrounds/Battleground.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index 5d93ebd8b85..00f03068dc0 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -134,7 +134,9 @@ Battleground::~Battleground() // unload map if (m_Map) { - m_Map->SetUnload(); + m_Map->UnloadAll(); // unload all objects (they may hold a reference to bg in their ZoneScript pointer) + m_Map->SetUnload(); // mark for deletion by MapManager + //unlink to prevent crash, always unlink all pointer reference before destruction m_Map->SetBG(nullptr); m_Map = nullptr; diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index da4aa7ced8e..e0fcfabd056 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -244,7 +244,7 @@ class TC_GAME_API Map : public GridRefManager<NGridType> bool UnloadGrid(NGridType& ngrid, bool pForce); void GridMarkNoUnload(uint32 x, uint32 y); void GridUnmarkNoUnload(uint32 x, uint32 y); - virtual void UnloadAll(); + void UnloadAll(); void ResetGridExpiry(NGridType &grid, float factor = 1) const { |