From cae91f1650c080458f8edbd5cb6fd6b638215e0a Mon Sep 17 00:00:00 2001 From: Kargatum Date: Sun, 1 Sep 2019 23:03:51 +0700 Subject: [PATCH] fix (Core/Vehicle): delay position update in Vehicles, this may be deleted (#2247) --- src/server/game/Entities/Vehicle/Vehicle.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index e2ae54f16..4d17c128e 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -498,19 +498,25 @@ void Vehicle::RelocatePassengers() { ASSERT(_me->GetMap()); + std::vector> seatRelocation; + seatRelocation.reserve(Seats.size()); + // not sure that absolute position calculation is correct, it must depend on vehicle pitch angle - for (SeatMap::const_iterator itr = Seats.begin(); itr != Seats.end(); ++itr) + for (auto const& itr : Seats) { - if (Unit* passenger = ObjectAccessor::GetUnit(*GetBase(), itr->second.Passenger.Guid)) + if (Unit* passenger = ObjectAccessor::GetUnit(*GetBase(), itr.second.Passenger.Guid)) { ASSERT(passenger->IsInWorld()); float px, py, pz, po; passenger->m_movementInfo.transport.pos.GetPosition(px, py, pz, po); CalculatePassengerPosition(px, py, pz, &po); - passenger->UpdatePosition(px, py, pz, po); + seatRelocation.emplace_back(passenger, Position(px, py, pz, po)); } } + + for (auto const& pair : seatRelocation) + pair.first->UpdatePosition(pair.second); } void Vehicle::Dismiss()