Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Phases: Fix area phase handling

Browse Source 
Now honors the zone id as well as area id
This commit is contained in:
Ryan
2017-05-28 20:01:36 +01:00
parent f29874d7ad
commit b1de58c7f8
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/game/Entities/Object/Object.cpp
View File

@@ -2649,11 +2649,13 @@ bool WorldObject::SetInPhase(uint32 id, bool update, bool apply)
{
// if area phase passes the condition we should not remove it (ie: if remove called from aura remove)
// this however breaks the .mod phase command, you wont be able to remove any area based phases with it
if (std::vector<PhaseInfoStruct> const* phases = sObjectMgr->GetPhasesForArea(GetAreaId()))
for (PhaseInfoStruct const& phase : *phases)
if (id == phase.Id)
if (sConditionMgr->IsObjectMeetToConditions(this, phase.Conditions))
return false;
PhaseInfo const& phases = sObjectMgr->GetAreaPhases();
for (PhaseInfo::const_iterator itr = phases.begin(); itr != phases.end(); ++itr)
if (itr->first == GetAreaId() || itr->first == GetZoneId())
for (PhaseInfoStruct const& phase : itr->second)
if (id == phase.Id)
if (sConditionMgr->IsObjectMeetToConditions(this, phase.Conditions))
return false;
if (!HasInPhaseList(id)) // do not run the updates if we are not in this phase
return false;