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

Core/AreaTriggers: Handle exit areatrigger on player map change

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/26fc14419142e3188370035ce4144cdb125bec05)
This commit is contained in:
Hondacrx
2025-09-05 21:14:36 -04:00
parent 217bccde02
commit dbf160fbdf
5 changed files with 86 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/AreaTrigger/AreaTrigger.cs
+61 -38
View File
@@ -832,56 +832,71 @@ namespace Game.Entities
// Handle after _insideUnits have been reinserted so we can use GetInsideUnits() in hooks
foreach (Unit unit in enteringUnits)
{
Player player = unit.ToPlayer();
if (player != null)
{
if (player.IsDebugAreaTriggers)
player.SendSysMessage(CypherStrings.DebugAreatriggerEntityEntered, GetEntry(), IsCustom(), IsStaticSpawn(), _spawnId);
player.UpdateQuestObjectiveProgress(QuestObjectiveType.AreaTriggerEnter, (int)GetEntry(), 1);
if (GetTemplate().ActionSetId != 0)
player.UpdateCriteria(CriteriaType.EnterAreaTriggerWithActionSet, GetTemplate().ActionSetId);
}
DoActions(unit);
_ai.OnUnitEnter(unit);
}
HandleUnitEnter(unit);
foreach (ObjectGuid exitUnitGuid in exitUnits)
{
Unit leavingUnit = Global.ObjAccessor.GetUnit(this, exitUnitGuid);
if (leavingUnit != null)
{
Player player = leavingUnit.ToPlayer();
if (player != null)
{
if (player.IsDebugAreaTriggers)
player.SendSysMessage(CypherStrings.DebugAreatriggerEntityLeft, GetEntry(), IsCustom(), IsStaticSpawn(), _spawnId);
player.UpdateQuestObjectiveProgress(QuestObjectiveType.AreaTriggerExit, (int)GetEntry(), 1);
if (GetTemplate().ActionSetId != 0)
player.UpdateCriteria(CriteriaType.LeaveAreaTriggerWithActionSet, GetTemplate().ActionSetId);
}
UndoActions(leavingUnit);
_ai.OnUnitExit(leavingUnit);
}
HandleUnitExitInternal(leavingUnit);
}
if (_insideUnits.Any(guid => guid.IsPlayer()))
SetAreaTriggerFlag(AreaTriggerFieldFlags.HasPlayers);
else
RemoveAreaTriggerFlag(AreaTriggerFieldFlags.HasPlayers);
UpdateHasPlayersFlag();
if (IsStaticSpawn())
SetActive(!_insideUnits.Empty());
}
void HandleUnitEnter(Unit unit)
{
Player player = unit.ToPlayer();
if (player != null)
{
if (player.IsDebugAreaTriggers)
player.SendSysMessage(CypherStrings.DebugAreatriggerEntityEntered, GetEntry(), IsCustom(), IsStaticSpawn(), _spawnId);
player.UpdateQuestObjectiveProgress(QuestObjectiveType.AreaTriggerEnter, (int)GetEntry(), 1);
if (GetTemplate().ActionSetId != 0)
player.UpdateCriteria(CriteriaType.EnterAreaTriggerWithActionSet, GetTemplate().ActionSetId);
}
DoActions(unit);
_ai.OnUnitEnter(unit);
unit.EnterAreaTrigger(this);
}
void HandleUnitExitInternal(Unit unit)
{
Player player = unit.ToPlayer();
if (player != null)
{
if (player.IsDebugAreaTriggers)
player.SendSysMessage(CypherStrings.DebugAreatriggerEntityLeft, GetEntry(), IsCustom(), IsStaticSpawn(), _spawnId);
player.UpdateQuestObjectiveProgress(QuestObjectiveType.AreaTriggerExit, (int)GetEntry(), 1);
if (GetTemplate().ActionSetId != 0)
player.UpdateCriteria(CriteriaType.LeaveAreaTriggerWithActionSet, GetTemplate().ActionSetId);
}
UndoActions(unit);
_ai.OnUnitExit(unit);
unit.ExitAreaTrigger(this);
}
public void HandleUnitExit(Unit unit)
{
_insideUnits.Remove(unit.GetGUID());
HandleUnitExitInternal(unit);
UpdateHasPlayersFlag();
}
public AreaTriggerTemplate GetTemplate()
{
return _areaTriggerTemplate;
@@ -1501,6 +1516,14 @@ namespace Game.Entities
public bool IsStaticSpawn() { return _spawnId != 0; }
public bool HasActionSetFlag(AreaTriggerActionSetFlag flag) { return _areaTriggerTemplate.ActionSetFlags.HasFlag(flag); }
void UpdateHasPlayersFlag()
{
if (_insideUnits.Any(guid => guid.IsPlayer()))
SetAreaTriggerFlag(AreaTriggerFieldFlags.HasPlayers);
else
RemoveAreaTriggerFlag(AreaTriggerFieldFlags.HasPlayers);
}
[System.Diagnostics.Conditional("DEBUG")]
void DebugVisualizePosition()
{
Source/Game/Entities/Player/Player.cs
+3
View File
@@ -4795,6 +4795,9 @@ namespace Game.Entities
pet.CombatStop();
// exit areatriggers before saving to remove auras applied by them
pet.ExitAllAreaTriggers();
// only if current pet in slot
pet.SavePetToDB(mode);
Source/Game/Entities/Unit/Unit.Fields.cs
+1
View File
@@ -101,6 +101,7 @@ namespace Game.Entities
DiminishingReturn[] m_Diminishing = new DiminishingReturn[(int)DiminishingGroup.Max];
protected List<GameObject> m_gameObj = new();
List<AreaTrigger> m_areaTrigger = new();
List<AreaTrigger> m_insideAreaTriggers = new();
protected List<DynamicObject> m_dynObj = new();
protected float[] CreateStats = new float[(int)Stats.Max];
float[] m_floatStatPosBuff = new float[(int)Stats.Max];
Source/Game/Entities/Unit/Unit.cs
+18
View File
@@ -877,6 +877,24 @@ namespace Game.Entities
}
}
public void EnterAreaTrigger(AreaTrigger areaTrigger)
{
m_insideAreaTriggers.Add(areaTrigger);
}
public void ExitAreaTrigger(AreaTrigger areaTrigger)
{
m_insideAreaTriggers.Remove(areaTrigger);
}
public void ExitAllAreaTriggers()
{
foreach (AreaTrigger at in m_insideAreaTriggers.ToList())
at.HandleUnitExit(this);
}
public List<AreaTrigger> GetInsideAreaTriggers() { return m_insideAreaTriggers; }
public NPCFlags GetNpcFlags() { return (NPCFlags)m_unitData.NpcFlags.GetValue(); }
public bool HasNpcFlag(NPCFlags flags) { return (m_unitData.NpcFlags & (uint)flags) != 0; }
public void SetNpcFlag(NPCFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags), (uint)flags); }