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

Core/Misc: A variety of clean-up changes:

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/5aee452943e5c76f54f58eea9e6880b54a61ec9c)
This commit is contained in:
hondacrx
2021-05-18 12:31:45 -04:00
parent c92693102d
commit 66ba3fe724
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Maps/Map.cs
+3 -2
View File
@@ -2678,7 +2678,7 @@ namespace Game.Maps
SpawnGroupTemplateData GetSpawnGroupData(uint groupId)
{
SpawnGroupTemplateData data = Global.ObjectMgr.GetSpawnGroupData(groupId);
if (data != null && data.mapId == GetId())
if (data != null && (data.flags.HasAnyFlag(SpawnGroupFlags.System) || data.mapId == GetId()))
return data;
return null;
@@ -2812,13 +2812,14 @@ namespace Game.Maps
SpawnGroupTemplateData data = GetSpawnGroupData(groupId);
if (data == null)
{
Log.outWarn(LogFilter.Maps, $"Tried to query state of non-existing spawn group {groupId} on map {GetId()}.");
Log.outError(LogFilter.Maps, $"Tried to query state of non-existing spawn group {groupId} on map {GetId()}.");
return false;
}
if (data.flags.HasAnyFlag(SpawnGroupFlags.System))
return true;
// either manual spawn group and toggled, or not manual spawn group and not toggled...
return _toggledSpawnGroupIds.Contains(groupId) != !data.flags.HasAnyFlag(SpawnGroupFlags.ManualSpawn);
}