Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Battlefield: Fixed startup crash when compiled without scripts

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/c5d3bd2cdd8f5ccf0d458fd9a97f315d87c1113a)
This commit is contained in:
hondacrx
2022-02-24 10:58:06 -05:00
parent 722ed3be78
commit ed7cb3683d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/BattleFields/BattleField.cs
+1 -1
View File
@@ -469,7 +469,7 @@ namespace Game.BattleFields
Global.CreatureTextMgr.SendChat(stalker, (byte)id, target); Global.CreatureTextMgr.SendChat(stalker, (byte)id, target);
} }
void SendInitWorldStatesTo(Player player) public void SendInitWorldStatesTo(Player player)
{ {
InitWorldStates packet = new(); InitWorldStates packet = new();
packet.MapID = m_MapId; packet.MapID = m_MapId;
Source/Game/BattleFields/BattleFieldManager.cs
+3
View File
@@ -46,6 +46,9 @@ namespace Game.BattleFields
uint scriptId = Global.ObjectMgr.GetScriptId(result.Read<string>(1)); uint scriptId = Global.ObjectMgr.GetScriptId(result.Read<string>(1));
var bf = Global.ScriptMgr.CreateBattlefield(scriptId); var bf = Global.ScriptMgr.CreateBattlefield(scriptId);
if (bf == null)
continue;
if (!bf.SetupBattlefield()) if (!bf.SetupBattlefield())
{ {
Log.outInfo(LogFilter.Battlefield, $"Setting up battlefield with TypeId {typeId} failed."); Log.outInfo(LogFilter.Battlefield, $"Setting up battlefield with TypeId {typeId} failed.");