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

Core/Phases: fix logic in SetInPhase()

Browse Source 
- we should not remove the terrain swap if another phase still use it

(cherry picked from commit 299c693b8420d81951ef67b8481e4ad6b192473f)
This commit is contained in:
Rat
2014-10-27 22:56:21 +01:00
committed by DDuarte
parent 8b1e546ce9
commit 001e1ce935
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2726,23 +2726,21 @@ void WorldObject::SetPhaseMask(uint32 newPhaseMask, bool update)
void WorldObject::SetInPhase(uint32 id, bool update, bool apply)
{
std::list<uint32> terrainSwaps = sObjectMgr->GetPhaseTerrainSwaps(id);
if (apply)
{
_phases.insert(id);
_terrainSwaps.insert(terrainSwaps.begin(), terrainSwaps.end());
}
else
{
_phases.erase(id);
// Remove the terrain swaps that were applied by this phase
// Iterator pointing to the start of the sequence of elements that we're going to delete
// other phases could use the same terrain swaps too, check for them before remove!!!
// Clear all terrain swaps, will be rebuilt below
// Reason for this is, multiple phases can have the same terrain swap, we should not remove the swap if another phase still use it
_terrainSwaps.clear();
//std::set<uint32>::iterator endRange = std::set_difference(_terrainSwaps.begin(), _terrainSwaps.end(), terrainSwaps.begin(), terrainSwaps.end(), _terrainSwaps.begin());
//terrainSwaps.erase(endRange, _terrainSwaps.end());
// Check all applied phases for terrain swap and add it only once
for (auto phaseId : _phases)
{
std::list<uint32> swaps = sObjectMgr->GetPhaseTerrainSwaps(phaseId);
for (auto swap : swaps)
_terrainSwaps.insert(swap);
}
if (update && IsInWorld())