From 5872f032c906bdee5f292919808bd221994fad5e Mon Sep 17 00:00:00 2001 From: Meji Date: Tue, 14 Feb 2023 22:26:50 +0100 Subject: [PATCH] Core/Transports: Fixed event timestamps for edge cases Closes #28815 --- src/server/game/Maps/TransportMgr.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/game/Maps/TransportMgr.cpp b/src/server/game/Maps/TransportMgr.cpp index 58b8b7f6342..c27b14b3673 100644 --- a/src/server/game/Maps/TransportMgr.cpp +++ b/src/server/game/Maps/TransportMgr.cpp @@ -406,14 +406,14 @@ static void InitializeLeg(TransportPathLeg* leg, std::vector if ((*eventPointItr)->ArrivalEventID) { TransportPathEvent& event = outEvents->emplace_back(); - event.Timestamp = totalTime + splineTime + leg->Duration; + event.Timestamp = totalTime + splineTime + leg->Duration + delaySum; event.EventId = (*eventPointItr)->ArrivalEventID; } if ((*eventPointItr)->DepartureEventID) { TransportPathEvent& event = outEvents->emplace_back(); - event.Timestamp = totalTime + splineTime + leg->Duration + (pausePointItr == eventPointItr ? (*eventPointItr)->Delay * IN_MILLISECONDS : 0); + event.Timestamp = totalTime + splineTime + leg->Duration + delaySum + (pausePointItr == eventPointItr ? (*eventPointItr)->Delay * IN_MILLISECONDS : 0); event.EventId = (*eventPointItr)->DepartureEventID; } } @@ -452,14 +452,14 @@ static void InitializeLeg(TransportPathLeg* leg, std::vector if ((*eventPointItr)->ArrivalEventID) { TransportPathEvent& event = outEvents->emplace_back(); - event.Timestamp = totalTime + splineTime + leg->Duration; + event.Timestamp = totalTime + splineTime + leg->Duration + delaySum; event.EventId = (*eventPointItr)->ArrivalEventID; } if ((*eventPointItr)->DepartureEventID) { TransportPathEvent& event = outEvents->emplace_back(); - event.Timestamp = totalTime + splineTime + leg->Duration; + event.Timestamp = totalTime + splineTime + leg->Duration + delaySum; event.EventId = (*eventPointItr)->DepartureEventID; } }