Core/Entities: Take terrain swaps into account when calculating LoS/height/area

3 files changed, 32 insertions, 0 deletions

diff --git a/src/server/game/Phasing/PhaseShift.cpp b/src/server/game/Phasing/PhaseShift.cpp
index b2885ae15bb..d543ccd1f22 100644
--- a/src/server/game/Phasing/PhaseShift.cpp
+++ b/src/server/game/Phasing/PhaseShift.cpp
@@ -17,6 +17,8 @@
 
 #include "PhaseShift.h"
 #include "Containers.h"
+#include "GridDefines.h"
+#include "VMapFactory.h"
 
 bool PhaseShift::AddPhase(uint32 phaseId, PhaseFlags flags, std::vector<Condition*> const* areaConditions, int32 references /*= 1*/)
 {
@@ -145,6 +147,33 @@ bool PhaseShift::CanSee(PhaseShift const& other) const
     return checkInversePhaseShift(other, *this);
 }
 
+uint32 PhaseShift::GetTerrainMapId(uint32 realMapId, float x, float y) const
+{
+    if (VisibleMapIds.empty())
+        return realMapId;
+
+    if (VisibleMapIds.size() == 1)
+        return VisibleMapIds.begin()->first;
+
+    GridCoord gridCoord = Trinity::ComputeGridCoord(x, y);
+    int32 gx = (MAX_NUMBER_OF_GRIDS - 1) - gridCoord.x_coord;
+    int32 gy = (MAX_NUMBER_OF_GRIDS - 1) - gridCoord.y_coord;
+
+    int32 minDistance = std::numeric_limits<int32>::max();
+    uint32 terrainMapId;
+    for (auto itr = VisibleMapIds.begin(); itr != VisibleMapIds.end(); ++itr)
+    {
+        int32 dist = VMAP::VMapFactory::createOrGetVMapManager()->GetDistanceToClosestPrimaryTile(itr->first, gx, gy);
+        if (dist < minDistance)
+        {
+            minDistance = dist;
+            terrainMapId = itr->first;
+        }
+    }
+
+    return terrainMapId;
+}
+
 void PhaseShift::ModifyPhasesReferences(PhaseContainer::iterator itr, int32 references)
 {
     itr->References += references;
diff --git a/src/server/game/Phasing/PhaseShift.h b/src/server/game/Phasing/PhaseShift.h
index 8755868ae9d..ca38614ed45 100644
--- a/src/server/game/Phasing/PhaseShift.h
+++ b/src/server/game/Phasing/PhaseShift.h
@@ -101,6 +101,7 @@ public:
     void ClearPhases();
 
     bool CanSee(PhaseShift const& other) const;
+    uint32 GetTerrainMapId(uint32 realMapId, float x, float y) const;
 
 protected:
     friend class PhasingHandler;
diff --git a/src/server/game/Phasing/PhasingHandler.cpp b/src/server/game/Phasing/PhasingHandler.cpp
index 2f0fd7d870e..08ed3f729b0 100644
--- a/src/server/game/Phasing/PhasingHandler.cpp
+++ b/src/server/game/Phasing/PhasingHandler.cpp
@@ -422,6 +422,7 @@ void PhasingHandler::FillPartyMemberPhase(WorldPackets::Party::PartyMemberPhaseS
 
 void PhasingHandler::InitDbPhaseShift(PhaseShift& phaseShift, uint8 phaseUseFlags, uint16 phaseId, uint32 phaseGroupId)
 {
+    phaseShift.ClearPhases();
     phaseShift.IsDbPhaseShift = true;
 
     EnumClassFlag<PhaseShiftFlags> flags = PhaseShiftFlags::None;
@@ -449,6 +450,7 @@ void PhasingHandler::InitDbPhaseShift(PhaseShift& phaseShift, uint8 phaseUseFlag
 
 void PhasingHandler::InitDbVisibleMapId(PhaseShift& phaseShift, int32 visibleMapId)
 {
+    phaseShift.VisibleMapIds.clear();
     if (visibleMapId != -1)
         phaseShift.AddVisibleMapId(visibleMapId, sObjectMgr->GetTerrainSwapInfo(visibleMapId));
 }