Visibility: Fix interaction of infinite objects with phasing

cmangos · Mar 9, 2025 · f3cf0ce · f3cf0ce
1 parent c0e1729
commit f3cf0ce
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 3 deletions.
diff --git a/src/game/Entities/GameObject.cpp b/src/game/Entities/GameObject.cpp
@@ -1216,7 +1216,7 @@ bool GameObject::isVisibleForInState(Player const* u, WorldObject const* viewPoi
         }
     }
 
-    if (GetVisibilityData().IsInfiniteVisibility())
+    if (GetVisibilityData().IsInfiniteVisibility() && InSamePhase(viewPoint))
         return true;
 
     // check distance

diff --git a/src/game/Entities/Player.cpp b/src/game/Entities/Player.cpp
@@ -21337,6 +21337,8 @@ void Player::SetPhaseMask(uint32 newPhaseMask, bool update)
     if (Unit* vehicle = const_cast<Unit*>(FindRootVehicle()))
         vehicle->SetPhaseMask(newPhaseMask, update);
     GetSession()->SendSetPhaseShift(GetPhaseMask());
+
+    m_pendingPhaseChange = true;
 }
 
 void Player::InitPrimaryProfessions()

diff --git a/src/game/Entities/Player.h b/src/game/Entities/Player.h
@@ -2617,6 +2617,8 @@ class Player : public Unit
         void SetLastData(uint32 dbGuid, bool gameobject) { m_lastDbGuid = dbGuid; m_lastGameObject = gameobject; }
 
         bool IsMirrorTimerActive(MirrorTimer::Type timer) const;
+        bool IsPendingPhaseChange() const { return m_pendingPhaseChange; }
+        void RemovePendingPhaseChange() { m_pendingPhaseChange = false; }
     protected:
         /*********************************************************/
         /***               BATTLEGROUND SYSTEM                 ***/
@@ -2995,6 +2997,7 @@ class Player : public Unit
         bool m_pendingMountAuraFlying;
         bool m_pendingDismount;
         bool m_pendingTaxi;
+        bool m_pendingPhaseChange;
 };
 
 void AddItemsSetItem(Player* player, Item* item);

diff --git a/src/game/Entities/Unit.cpp b/src/game/Entities/Unit.cpp
@@ -9271,9 +9271,11 @@ bool Unit::IsVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, boo
     // Any units far than max visible distance for viewer or not in our map are not visible too
     if (!at_same_transport && !GetVisibilityData().IsInfiniteVisibility()) // distance for show player/pet/creature (no transport case)
     {
-        if (!IsWithinDistInMap(viewPoint, u->GetVisibilityData().GetVisibilityDistanceFor((WorldObject *)this), is3dDistance))
+        if (!IsWithinDistInMap(viewPoint, u->GetVisibilityData().GetVisibilityDistanceFor((WorldObject*)this), is3dDistance))
             return false;
     }
+    else if (GetVisibilityData().IsInfiniteVisibility() && !InSamePhase(viewPoint))
+        return false;
 
     // when restriction not set, visible to all
     if (!IsOnlyVisibleTo(u->GetObjectGuid()))

diff --git a/src/game/Grids/GridNotifiers.cpp b/src/game/Grids/GridNotifiers.cpp
@@ -95,6 +95,12 @@ void VisibleNotifier::Notify()
         ++itr;
     }
 
+    if (player.IsPendingPhaseChange())
+    {
+        player.GetMap()->UpdateInfinite(player, i_data, i_clientGUIDs, i_visibleNow);
+        player.RemovePendingPhaseChange();
+    }
+
     // generate outOfRange for not iterate objects
     i_data.AddOutOfRangeGUID(i_clientGUIDs);
     for (GuidSet::iterator itr = i_clientGUIDs.begin(); itr != i_clientGUIDs.end(); ++itr)

diff --git a/src/game/Maps/Map.cpp b/src/game/Maps/Map.cpp
@@ -1760,7 +1760,7 @@ void Map::SendInitInfiniteObjects(Player* player, UpdateData& updateData) const
     for (auto i : m_infiniteObjects)
     {
         // send data for current transport in other place - if player is on transport, already sent in init self
-        if (i->GetMapId() == i_id && !player->HasAtClient(i))
+        if (i->GetMapId() == i_id && !player->HasAtClient(i) && i->InSamePhase(player))
         {
             player->AddAtClient(i);
             i->BuildCreateUpdateBlockForPlayer(updateData, player);
@@ -1788,6 +1788,30 @@ void Map::SendRemoveInfinite(Player* player) const
     updateData.SendData(*player->GetSession());
 }
 
+void Map::UpdateInfinite(Player& player, UpdateData& updateData, GuidSet& clientGUIDs, WorldObjectSet& visibleNow) const
+{
+    for (auto i : m_infiniteObjects)
+    {
+        if (i->GetMapId() == i_id)
+        {
+            if (player.HasAtClient(i))
+            {
+                if (!player.InSamePhase(i))
+                {
+                    i->BuildOutOfRangeUpdateBlock(updateData);
+                    player.RemoveAtClient(i);
+                }
+            }
+            else if (player.InSamePhase(i))
+            {
+                player.AddAtClient(i);
+                i->BuildCreateUpdateBlockForPlayer(updateData, &player);
+                visibleNow.insert(i);
+            }
+        }
+    }
+}
+
 void Map::LoadTransports()
 {
     uint32 mapId = GetId();

diff --git a/src/game/Maps/Map.h b/src/game/Maps/Map.h
@@ -469,6 +469,8 @@ class Map : public GridRefManager<NGridType>
         void AddWaypointingNpc(Unit* npc);
         void RemoveWaypointingNpc(Unit* npc);
 
+        void UpdateInfinite(Player& player, UpdateData& updateData, GuidSet& clientGUIDs, WorldObjectSet& visibleNow) const;
+
     private:
         void LoadMapAndVMap(int gx, int gy);