fix(Core/Transports): Improve static transport visibility (#22660)

src/server/game/Entities/GameObject/GameObject.h

@@ -156,8 +156,8 @@ public:
 
     void SaveToDB(bool saveAddon = false);
     void SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask, bool saveAddon = false);
-    bool LoadFromDB(ObjectGuid::LowType guid, Map* map) { return LoadGameObjectFromDB(guid, map, false); }
-    bool LoadGameObjectFromDB(ObjectGuid::LowType guid, Map* map, bool addToMap = true);
+    virtual bool LoadFromDB(ObjectGuid::LowType guid, Map* map) { return LoadGameObjectFromDB(guid, map, false); }
+    virtual bool LoadGameObjectFromDB(ObjectGuid::LowType guid, Map* map, bool addToMap = true);
     void DeleteFromDB();
 
     void SetOwnerGUID(ObjectGuid owner)

src/server/game/Entities/Object/ObjectVisibilityContainer.cpp

@@ -66,6 +66,10 @@ void ObjectVisibilityContainer::LinkWorldObjectVisibility(WorldObject* worldObje
     if (worldObject == _selfObject)
         return;
 
+    // Transports are special and should not be added to our visibility map
+    if (worldObject->IsGameObject() && worldObject->ToGameObject()->IsTransport())
+        return;
+
     // Only players can link visibility
     if (!_visibleWorldObjectsMap)
         return;

src/server/game/Entities/Player/PlayerUpdates.cpp

@@ -1645,10 +1645,7 @@ template <>
 inline void UpdateVisibilityOf_helper(Player* player, GameObject* target,
                                       std::vector<Unit*>& /*v*/)
 {
-    // @HACK: This is to prevent objects like deeprun tram from disappearing
-    // when player moves far from its spawn point while riding it
-    if ((target->GetGOInfo()->type != GAMEOBJECT_TYPE_TRANSPORT))
-        player->GetObjectVisibilityContainer().LinkWorldObjectVisibility(target);
+    player->GetObjectVisibilityContainer().LinkWorldObjectVisibility(target);
 }
 
 template <>

src/server/game/Entities/Transport/Transport.cpp

@@ -607,12 +607,12 @@ void MotionTransport::DelayedTeleportTransport()
     }
 
     Map* newMap = sMapMgr->CreateBaseMap(newMapId);
-    GetMap()->RemoveFromMap<MotionTransport>(this, false);
+    GetMap()->RemoveFromMap<Transport>(this, false);
     newMap->LoadGrid(x, y); // xinef: load before adding passengers to new map
     SetMap(newMap);
 
     Relocate(x, y, z, o);
-    GetMap()->AddToMap<MotionTransport>(this);
+    GetMap()->AddToMap<Transport>(this);
 
     LoadStaticPassengers();
 }
@@ -690,6 +690,40 @@ StaticTransport::~StaticTransport()
     ASSERT(_passengers.empty());
 }
 
+bool StaticTransport::LoadGameObjectFromDB(ObjectGuid::LowType spawnId, Map* map, bool addToMap)
+{
+    GameObjectData const* data = sObjectMgr->GetGameObjectData(spawnId);
+
+    if (!data)
+    {
+        LOG_ERROR("sql.sql", "Gameobject (GUID: {}) not found in table `gameobject`, can't load. ", spawnId);
+        return false;
+    }
+
+    uint32 entry = data->id;
+    //uint32 map_id = data->mapid;                          // already used before call
+    uint32 phaseMask = data->phaseMask;
+    float x = data->posX;
+    float y = data->posY;
+    float z = data->posZ;
+    float ang = data->orientation;
+
+    uint32 animprogress = data->animprogress;
+    GOState go_state = data->go_state;
+    uint32 artKit = data->artKit;
+
+    m_goData = data;
+    m_spawnId = spawnId;
+
+    if (!Create(map->GenerateLowGuid<HighGuid::Transport>(), entry, map, phaseMask, x, y, z, ang, data->rotation, animprogress, go_state, artKit))
+        return false;
+
+    if (addToMap && !GetMap()->AddToMap<Transport>(this))
+        return false;
+
+    return true;
+}
+
 bool StaticTransport::Create(ObjectGuid::LowType guidlow, uint32 name_id, Map* map, uint32 phaseMask, float x, float y, float z, float ang, G3D::Quat const& rotation, uint32 animprogress, GOState go_state, uint32 artKit)
 {
     ASSERT(map);
@@ -794,7 +828,6 @@ bool StaticTransport::Create(ObjectGuid::LowType guidlow, uint32 name_id, Map* m
     LastUsedScriptID = GetGOInfo()->ScriptId;
     AIM_Initialize();
 
-    this->setActive(true);
     return true;
 }
 
@@ -929,7 +962,9 @@ void StaticTransport::UpdatePosition(float x, float y, float z, float o)
     if (!GetMap()->IsGridLoaded(x, y)) // pussywizard: should not happen, but just in case
         GetMap()->LoadGrid(x, y);
 
-    GetMap()->GameObjectRelocation(this, x, y, z, o); // this also relocates the model
+    Relocate(x, y, z, o);
+    UpdateModelPosition();
+
     UpdatePassengerPositions();
 }
 

src/server/game/Entities/Transport/Transport.h

@@ -38,6 +38,8 @@ public:
     virtual void RemovePassenger(WorldObject* passenger, bool withAll = false) = 0;
     PassengerSet const& GetPassengers() const { return _passengers; }
 
+    virtual void DelayedUpdate(uint32 /*diff*/) {}
+
     uint32 GetPathProgress() const { return GetGOValue()->Transport.PathProgress; }
     void SetPathProgress(uint32 val) { m_goValue.Transport.PathProgress = val; }
 
@@ -57,7 +59,7 @@ public:
     void BuildUpdate(UpdateDataMapType& data_map) override;
 
     void Update(uint32 diff) override;
-    void DelayedUpdate(uint32 diff);
+    void DelayedUpdate(uint32 diff) override;
     void UpdatePosition(float x, float y, float z, float o);
 
     void AddPassenger(WorldObject* passenger, bool withAll = false) override;
@@ -115,6 +117,8 @@ public:
     StaticTransport();
     ~StaticTransport() override;
 
+    bool LoadFromDB(ObjectGuid::LowType guid, Map* map) override { return LoadGameObjectFromDB(guid, map, false); }
+    bool LoadGameObjectFromDB(ObjectGuid::LowType guid, Map* map, bool addToMap = true) override;
     bool Create(ObjectGuid::LowType guidlow, uint32 name_id, Map* map, uint32 phaseMask, float x, float y, float z, float ang, G3D::Quat const& rotation, uint32 animprogress, GOState go_state, uint32 artKit = 0) override;
     void CleanupsBeforeDelete(bool finalCleanup = true) override;
     void BuildUpdate(UpdateDataMapType& data_map) override;