From ab6da5cd02a96096268d7dc016fad1c6d0ab99fa Mon Sep 17 00:00:00 2001
From: xinef1 <w.szyszko2@gmail.com>
Date: Wed, 11 Jan 2017 12:30:22 +0100
Subject: [PATCH] Fixed visual bug where accessory could detach from vehicle on
 client (#18590)

Closes #15153
---
 src/server/game/Entities/Object/Object.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 3992b4eb3e8..66756612632 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -1772,6 +1772,14 @@ bool WorldObject::CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth, boo
                             corpseVisibility = true;
                 }
             }
+
+            if (Unit const* target = obj->ToUnit())
+            {
+                // Don't allow to detect vehicle accessories if you can't see vehicle
+                if (Unit const* vehicle = target->GetVehicleBase())
+                    if (!thisPlayer->HaveAtClient(vehicle))
+                        return false;
+            }
         }
 
         WorldObject const* viewpoint = this;