diff options
| author | MitchesD <majklprofik@seznam.cz> | 2016-05-18 20:06:47 +0200 |
|---|---|---|
| committer | MitchesD <majklprofik@seznam.cz> | 2016-05-18 20:06:47 +0200 |
| commit | f636141345a98569840548372dbb6030299d91b3 (patch) | |
| tree | 40ae2c2bb32ccf66f14a38ff90544118968a9ac4 /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | 042e1ae266c968ce27994b1b4feb7342adb52db7 (diff) | |
Core/Phase: phase_area table now support even parent area (known as zone)
Closes https://github.com/TrinityCore/TrinityCore/issues/17025
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 5494f5a8bb4..2ff7196a2dc 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -1379,7 +1379,7 @@ bool ConditionMgr::addToPhases(Condition* cond) const if (!cond->SourceEntry) { bool found = false; - PhaseInfo& p = sObjectMgr->GetAreaPhasesForLoading(); + PhaseInfo& p = sObjectMgr->GetAreaAndZonePhasesForLoading(); for (auto phaseItr = p.begin(); phaseItr != p.end(); ++phaseItr) { for (PhaseInfoStruct& phase : phaseItr->second) @@ -1395,7 +1395,7 @@ bool ConditionMgr::addToPhases(Condition* cond) const if (found) return true; } - else if (std::vector<PhaseInfoStruct>* phases = sObjectMgr->GetPhasesForAreaForLoading(cond->SourceEntry)) + else if (std::vector<PhaseInfoStruct>* phases = sObjectMgr->GetPhasesForAreaOrZoneForLoading(cond->SourceEntry)) { for (PhaseInfoStruct& phase : *phases) { |