aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Battlegrounds/Battleground.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2023-01-15 14:25:18 +0100
committerShauren <shauren.trinity@gmail.com>2023-01-15 14:25:18 +0100
commit3fc3cd455b51d2de4ba5a70b7eff15e23b3da481 (patch)
tree1291c14bb69c9cbf2fbcf73032ee5a42d3cf7ca8 /src/server/game/Battlegrounds/Battleground.cpp
parentbadb55bfd97c16fecfb8cd73ba99e39ecb6b622d (diff)
Core/Battlegrounds: Unload all grids before destroying battleground object
Closes #28755
Diffstat (limited to 'src/server/game/Battlegrounds/Battleground.cpp')
-rw-r--r--src/server/game/Battlegrounds/Battleground.cpp4
1 files changed, 3 insertions, 1 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;