Core/Phasing: merged a missing commit

This commit is contained in:
Ovahlord
2018-09-24 18:35:04 +02:00
parent fbd91007e4
commit 1f59718fc4

View File

@@ -294,6 +294,7 @@ void PhasingHandler::OnConditionChange(WorldObject* object)
if (itr->AreaConditions && !sConditionMgr->IsObjectMeetToConditions(srcInfo, *itr->AreaConditions))
{
newSuppressions.AddPhase(itr->Id, itr->Flags, itr->AreaConditions, itr->References);
phaseShift.ModifyPhasesReferences(itr, -itr->References);
itr = phaseShift.Phases.erase(itr);
}
else
@@ -305,6 +306,7 @@ void PhasingHandler::OnConditionChange(WorldObject* object)
if (sConditionMgr->IsObjectMeetToConditions(srcInfo, *ASSERT_NOTNULL(itr->AreaConditions)))
{
changed = phaseShift.AddPhase(itr->Id, itr->Flags, itr->AreaConditions, itr->References) || changed;
suppressedPhaseShift.ModifyPhasesReferences(itr, -itr->References);
itr = suppressedPhaseShift.Phases.erase(itr);
}
else