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

Core/Spawns: Allow spawn groups with MANUAL_SPAWN flag to automatically despawn if conditions are not met

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/97d413c9b4be6af296490580f7acc1d66e606ca9)
This commit is contained in:
hondacrx
2023-02-11 23:30:57 -05:00
parent 4b798e7cab
commit da283244ca
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Conditions/ConditionManager.cs
+2 -2
View File
@@ -1260,9 +1260,9 @@ namespace Game
Log.outError(LogFilter.Sql, $"{cond.ToString()} SourceEntry in `condition` table, does not exist in `spawn_group_template`, ignoring."); Log.outError(LogFilter.Sql, $"{cond.ToString()} SourceEntry in `condition` table, does not exist in `spawn_group_template`, ignoring.");
return false; return false;
} }
if (spawnGroup.flags.HasAnyFlag(SpawnGroupFlags.System | SpawnGroupFlags.ManualSpawn)) if (spawnGroup.flags.HasAnyFlag(SpawnGroupFlags.System))
{ {
Log.outError(LogFilter.Sql, $"{cond.ToString()} in `spawn_group_template` table cannot have SPAWNGROUP_FLAG_SYSTEM or SPAWNGROUP_FLAG_MANUAL_SPAWN flags, ignoring."); Log.outError(LogFilter.Sql, $"{cond.ToString()} in `spawn_group_template` table cannot have SPAWNGROUP_FLAG_SYSTEM flags, ignoring.");
return false; return false;
} }
break; break;
Source/Game/Maps/Map.cs
+10 -2
View File
@@ -2374,11 +2374,19 @@ namespace Game.Maps
foreach (uint spawnGroupId in spawnGroups) foreach (uint spawnGroupId in spawnGroups)
{ {
SpawnGroupTemplateData spawnGroupTemplate = GetSpawnGroupData(spawnGroupId); SpawnGroupTemplateData spawnGroupTemplate = GetSpawnGroupData(spawnGroupId);
if (spawnGroupTemplate.flags.HasFlag(SpawnGroupFlags.ManualSpawn))
continue;
bool isActive = IsSpawnGroupActive(spawnGroupId); bool isActive = IsSpawnGroupActive(spawnGroupId);
bool shouldBeActive = Global.ConditionMgr.IsMapMeetingNotGroupedConditions(ConditionSourceType.SpawnGroup, spawnGroupId, this); bool shouldBeActive = Global.ConditionMgr.IsMapMeetingNotGroupedConditions(ConditionSourceType.SpawnGroup, spawnGroupId, this);
if (spawnGroupTemplate.flags.HasFlag(SpawnGroupFlags.ManualSpawn))
{
// Only despawn the group if it isn't meeting conditions
if (isActive && !shouldBeActive && spawnGroupTemplate.flags.HasFlag(SpawnGroupFlags.DespawnOnConditionFailure))
SpawnGroupDespawn(spawnGroupId, true);
continue;
}
if (isActive == shouldBeActive) if (isActive == shouldBeActive)
continue; continue;