Vehicle: Do not show passengers of vehicle that is not visible to the…

… player
cmangos · Feb 22, 2023 · 5a3d198 · 5a3d198
1 parent fd1bc8a
commit 5a3d198
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/game/Entities/Player.h b/src/game/Entities/Player.h
@@ -2360,7 +2360,7 @@ class Player : public Unit
         Object* GetObjectByTypeMask(ObjectGuid guid, TypeMask typemask);
 
         // currently visible objects at player client
-        bool HasAtClient(WorldObject const* u) { return u == this || m_clientGUIDs.find(u->GetObjectGuid()) != m_clientGUIDs.end(); }
+        bool HasAtClient(WorldObject const* u) const { return u == this || m_clientGUIDs.find(u->GetObjectGuid()) != m_clientGUIDs.end(); }
         void AddAtClient(WorldObject* target);
         void RemoveAtClient(WorldObject* target);
         GuidSet& GetClientGuids() { return m_clientGUIDs; }

diff --git a/src/game/Entities/Unit.cpp b/src/game/Entities/Unit.cpp
@@ -10070,6 +10070,12 @@ bool Unit::IsVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, boo
     if (m_Visibility == VISIBILITY_REMOVE_CORPSE)
         return false;
 
+    if (this->IsBoarded())
+        if (Unit* vehicle = dynamic_cast<Unit*>(this->GetTransportInfo()->GetTransport()))
+            if (const Player* player = dynamic_cast<const Player*>(u))
+                if (!player->HasAtClient(vehicle))
+                    return false;
+
     Map& _map = *u->GetMap();
     // Grid dead/alive checks
     if (u->GetTypeId() == TYPEID_PLAYER)