From 89cb6bc6830ba7a8d708494a108a6f00e492594a Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sat, 4 Apr 2020 19:50:53 +0200 Subject: Core/Battleground: Attempt to fix a crash Please report this error if you get it (cherry picked from commit d1f9cf84a5fa4a91b70e7d9769a3f41ba8a94a9c) --- src/server/game/Battlegrounds/Battleground.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/server') diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index a7da1838393..05e63758917 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -1722,6 +1722,12 @@ void Battleground::EndNow() // buffs are in their positions when battleground starts void Battleground::HandleTriggerBuff(ObjectGuid go_guid) { + if (!FindBgMap()) + { + TC_LOG_ERROR("bg.battleground", "Battleground::HandleTriggerBuff called with null bg map, %s", go_guid.ToString().c_str()); + return; + } + GameObject* obj = GetBgMap()->GetGameObject(go_guid); if (!obj || obj->GetGoType() != GAMEOBJECT_TYPE_TRAP || !obj->isSpawned()) return; -- cgit v1.2.3