From ed7cb3683d80ec0d0d91ac98715ce54040ec4147 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 24 Feb 2022 10:58:06 -0500 Subject: [PATCH] Core/Battlefield: Fixed startup crash when compiled without scripts Port From (https://github.com/TrinityCore/TrinityCore/commit/c5d3bd2cdd8f5ccf0d458fd9a97f315d87c1113a) --- Source/Game/BattleFields/BattleField.cs | 2 +- Source/Game/BattleFields/BattleFieldManager.cs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Game/BattleFields/BattleField.cs b/Source/Game/BattleFields/BattleField.cs index 54a3009c2..8f18f905a 100644 --- a/Source/Game/BattleFields/BattleField.cs +++ b/Source/Game/BattleFields/BattleField.cs @@ -469,7 +469,7 @@ namespace Game.BattleFields Global.CreatureTextMgr.SendChat(stalker, (byte)id, target); } - void SendInitWorldStatesTo(Player player) + public void SendInitWorldStatesTo(Player player) { InitWorldStates packet = new(); packet.MapID = m_MapId; diff --git a/Source/Game/BattleFields/BattleFieldManager.cs b/Source/Game/BattleFields/BattleFieldManager.cs index 4439dc69c..f92ead578 100644 --- a/Source/Game/BattleFields/BattleFieldManager.cs +++ b/Source/Game/BattleFields/BattleFieldManager.cs @@ -46,6 +46,9 @@ namespace Game.BattleFields uint scriptId = Global.ObjectMgr.GetScriptId(result.Read(1)); var bf = Global.ScriptMgr.CreateBattlefield(scriptId); + if (bf == null) + continue; + if (!bf.SetupBattlefield()) { Log.outInfo(LogFilter.Battlefield, $"Setting up battlefield with TypeId {typeId} failed.");