Fix for loading gameobject / creature in bg when bg has unloaded (#98)

celguar · Mar 25, 2024 · d8319af · d8319af
1 parent 506b967
commit d8319af
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/game/Entities/Creature.cpp b/src/game/Entities/Creature.cpp
@@ -900,7 +900,17 @@ bool Creature::Create(uint32 dbGuid, uint32 guidlow, CreatureCreatePos& cPos, Cr
 
     // Notify the pvp script
     if (GetMap()->IsBattleGround())
-        static_cast<BattleGroundMap*>(GetMap())->GetBG()->HandleCreatureCreate(this);
+    {
+        BattleGround* bg = static_cast<BattleGroundMap*>(GetMap())->GetBG();
+        if (bg)
+        {
+            bg->HandleCreatureCreate(this);
+        }
+        else
+        {
+            return false;
+        }
+    }
     else if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(GetZoneId()))
         outdoorPvP->HandleCreatureCreate(this);
 

diff --git a/src/game/Entities/GameObject.cpp b/src/game/Entities/GameObject.cpp
@@ -291,7 +291,17 @@ bool GameObject::Create(uint32 dbGuid, uint32 guidlow, uint32 name_id, Map* map,
 
     // Notify the battleground or outdoor pvp script
     if (map->IsBattleGround())
-        ((BattleGroundMap*)map)->GetBG()->HandleGameObjectCreate(this);
+    {
+        BattleGround* bg = static_cast<BattleGroundMap*>(GetMap())->GetBG();
+        if (bg)
+        {
+            bg->HandleGameObjectCreate(this);
+        }
+        else
+        {
+            return false;
+        }
+    }
     else if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(GetZoneId()))
         outdoorPvP->HandleGameObjectCreate(this);