From 1405760f317cfcfed29aca5ab36633863a2d9dc9 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 15 Jul 2020 15:55:31 +0200 Subject: Core/Battlefield: Fixed startup crash when compiled without scripts --- src/server/game/Battlefield/BattlefieldMgr.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/server') diff --git a/src/server/game/Battlefield/BattlefieldMgr.cpp b/src/server/game/Battlefield/BattlefieldMgr.cpp index bd18e579464..6c86c832c30 100644 --- a/src/server/game/Battlefield/BattlefieldMgr.cpp +++ b/src/server/game/Battlefield/BattlefieldMgr.cpp @@ -64,6 +64,8 @@ void BattlefieldMgr::InitBattlefield() uint32 scriptId = sObjectMgr->GetScriptId(fields[1].GetString()); Battlefield* bf = sScriptMgr->CreateBattlefield(scriptId); + if (!bf) + continue; if (!bf->SetupBattlefield()) { -- cgit v1.2.3