Improve player sync when exiting vehicle (#2084)

Author: Zangomangu

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -537,21 +537,17 @@ void CClientPed::SetPosition(const CVector& vecPosition, bool bResetInterpolatio
         // Don't set the actual position if we're in a vehicle
         if (!GetRealOccupiedVehicle())
         {
-            // Set it only if we're not in a vehicle or not working on getting in/out
-            if (!m_pOccupiedVehicle || GetVehicleInOutState() != VEHICLE_INOUT_GETTING_OUT)
+            // Is this the local player?
+            if (m_bIsLocalPlayer)
             {
-                // Is this the local player?
-                if (m_bIsLocalPlayer)
-                {
-                    // If move is big enough, do ground checks
-                    float DistanceMoved = (m_Matrix.vPos - vecPosition).Length();
-                    if (DistanceMoved > 50 && !IsFrozen() && bAllowGroundLoadFreeze)
-                        SetFrozenWaitingForGroundToLoad(true);
-                }
-
-                // Set the real position
-                m_pPlayerPed->SetPosition(const_cast<CVector*>(&vecPosition));
+                // If move is big enough, do ground checks
+                float DistanceMoved = (m_Matrix.vPos - vecPosition).Length();
+                if (DistanceMoved > 50 && !IsFrozen() && bAllowGroundLoadFreeze)
+                    SetFrozenWaitingForGroundToLoad(true);
             }
+
+            // Set the real position
+            m_pPlayerPed->SetPosition(const_cast<CVector*>(&vecPosition));
         }
     }
 

Client/mods/deathmatch/logic/CClientVehicle.cpp

@@ -376,9 +376,11 @@ void CClientVehicle::SetPosition(const CVector& vecPosition, bool bResetInterpol
     }
 
     // If we have any occupants, update their positions
+    // Make sure we dont update their position if they are getting out and have physically left the car
     for (int i = 0; i <= NUMELMS(m_pPassengers); i++)
         if (CClientPed* pOccupant = GetOccupant(i))
-            pOccupant->SetPosition(vecPosition);
+            if (pOccupant->GetVehicleInOutState() != VEHICLE_INOUT_GETTING_OUT || pOccupant->GetRealOccupiedVehicle())
+                pOccupant->SetPosition(vecPosition);
 
     // Reset interpolation
     if (bResetInterpolation)
@@ -529,15 +531,11 @@ bool CClientVehicle::SetMatrix(const CMatrix& Matrix)
     m_MatrixPure = Matrix;
 
     // If we have any occupants, update their positions
-    if (m_pDriver)
-        m_pDriver->SetPosition(m_Matrix.vPos);
-    for (int i = 0; i < (sizeof(m_pPassengers) / sizeof(CClientPed*)); i++)
-    {
-        if (m_pPassengers[i])
-        {
-            m_pPassengers[i]->SetPosition(m_Matrix.vPos);
-        }
-    }
+    // Make sure we dont update their position if they are getting out and have physically left the car
+    for (int i = 0; i <= NUMELMS(m_pPassengers); i++)
+        if (CClientPed* pOccupant = GetOccupant(i))
+            if (pOccupant->GetVehicleInOutState() != VEHICLE_INOUT_GETTING_OUT || pOccupant->GetRealOccupiedVehicle())
+                pOccupant->SetPosition(m_Matrix.vPos);
 
     return true;
 }

Client/mods/deathmatch/logic/CNetAPI.cpp

@@ -318,16 +318,30 @@ void CNetAPI::DoPulse()
                 // Are in a vehicle?
                 if (pVehicle)
                 {
-                    // Send a puresync packet
-                    NetBitStreamInterface* pBitStream = g_pNet->AllocateNetBitStream();
-                    if (pBitStream)
+                    // Are we getting out and physically left the car
+                    if (pPlayer->GetVehicleInOutState() == VEHICLE_INOUT_GETTING_OUT && !pPlayer->GetRealOccupiedVehicle())
                     {
-                        // Write our data
-                        WriteVehiclePuresync(pPlayer, pVehicle, *pBitStream);
+                        // Send a player puresync packet
+                        NetBitStreamInterface* pBitStream = g_pNet->AllocateNetBitStream();
+                        if (pBitStream)
+                        {
+                            WritePlayerPuresync(pPlayer, *pBitStream);
 
-                        // Send the packet and destroy it
-                        g_pNet->SendPacket(PACKET_ID_PLAYER_VEHICLE_PURESYNC, pBitStream, PACKET_PRIORITY_MEDIUM, PACKET_RELIABILITY_UNRELIABLE_SEQUENCED);
-                        g_pNet->DeallocateNetBitStream(pBitStream);
+                            g_pNet->SendPacket(PACKET_ID_PLAYER_PURESYNC, pBitStream, PACKET_PRIORITY_MEDIUM, PACKET_RELIABILITY_UNRELIABLE_SEQUENCED);
+                            g_pNet->DeallocateNetBitStream(pBitStream);
+                        }
+                    }
+                    else
+                    {
+                        // Send a vehicle puresync packet
+                        NetBitStreamInterface* pBitStream = g_pNet->AllocateNetBitStream();
+                        if (pBitStream)
+                        {
+                            WriteVehiclePuresync(pPlayer, pVehicle, *pBitStream);
+
+                            g_pNet->SendPacket(PACKET_ID_PLAYER_VEHICLE_PURESYNC, pBitStream, PACKET_PRIORITY_MEDIUM, PACKET_RELIABILITY_UNRELIABLE_SEQUENCED);
+                            g_pNet->DeallocateNetBitStream(pBitStream);
+                        }
                     }
 
                     // Sync its damage model too
@@ -962,13 +976,9 @@ void CNetAPI::ReadPlayerPuresync(CClientPlayer* pPlayer, NetBitStreamInterface&
         position.data.vecPosition -= vecTempPos;
     }
 
-    // If the player is working on leaving a vehicle, don't set any target position
-    if (pPlayer->GetVehicleInOutState() == VEHICLE_INOUT_NONE || pPlayer->GetVehicleInOutState() == VEHICLE_INOUT_GETTING_IN ||
-        pPlayer->GetVehicleInOutState() == VEHICLE_INOUT_JACKING)
-    {
-        pPlayer->SetTargetPosition(position.data.vecPosition, TICK_RATE, pContactEntity);
-        pPlayer->SetTargetRotation(rotation.data.fRotation);
-    }
+    // Set position and rotation
+    pPlayer->SetTargetPosition(position.data.vecPosition, TICK_RATE, pContactEntity);
+    pPlayer->SetTargetRotation(rotation.data.fRotation);
 
     // Set move speed, controller state and camera rotation + duck state
     pPlayer->SetControllerState(ControllerState);

Client/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp

@@ -228,6 +228,16 @@ void CUnoccupiedVehicleSync::UpdateDamageModels()
 
 void CUnoccupiedVehicleSync::UpdateStates()
 {
+    CClientPlayer* pPlayer = g_pClientGame->GetLocalPlayer();
+    CDeathmatchVehicle* pVehicle = nullptr;
+    // Are we leaving a vehicle as driver and physically out of it
+    if (pPlayer && pPlayer->GetVehicleInOutState() == VEHICLE_INOUT_GETTING_OUT && pPlayer->GetOccupiedVehicle() && pPlayer->GetOccupiedVehicleSeat() == 0 && !pPlayer->GetRealOccupiedVehicle())
+    {
+        // Make sure it's valid and add it to our list temporarily
+        if (auto* pVehicle = dynamic_cast<CDeathmatchVehicle*>(pPlayer->GetOccupiedVehicle()))
+            m_List.push_front(pVehicle);
+    }
+
     // Got any items?
     if (m_List.size() > 0)
     {
@@ -250,6 +260,10 @@ void CUnoccupiedVehicleSync::UpdateStates()
             g_pNet->DeallocateNetBitStream(pBitStream);
         }
     }
+
+    // Remove our vehicle again
+    if (pVehicle)
+        m_List.remove(pVehicle);
 }
 
 bool CUnoccupiedVehicleSync::WriteVehicleInformation(NetBitStreamInterface* pBitStream, CDeathmatchVehicle* pVehicle)

Server/mods/deathmatch/logic/CGame.cpp

@@ -2265,23 +2265,27 @@ void CGame::Packet_PlayerPuresync(CPlayerPuresyncPacket& Packet)
         pPlayer->IncrementPuresync();
 
         // Ignore this packet if he should be in a vehicle
-        if (!pPlayer->GetOccupiedVehicle())
+        if (pPlayer->GetOccupiedVehicle())
         {
-            // Send a returnsync packet to the player that sent it
-            // Only every 4 packets.
-            if ((pPlayer->GetPuresyncCount() % 4) == 0)
-                pPlayer->Send(CReturnSyncPacket(pPlayer));
+            // Allow it if he's exiting
+            if (pPlayer->GetVehicleAction() != CPed::VEHICLEACTION_EXITING)
+                return;
+        }
 
-            CLOCK("PlayerPuresync", "RelayPlayerPuresync");
-            // Relay to other players
-            RelayPlayerPuresync(Packet);
-            UNCLOCK("PlayerPuresync", "RelayPlayerPuresync");
+        // Send a returnsync packet to the player that sent it
+        // Only every 4 packets.
+        if ((pPlayer->GetPuresyncCount() % 4) == 0)
+            pPlayer->Send(CReturnSyncPacket(pPlayer));
 
-            CLOCK("PlayerPuresync", "DoHitDetection");
-            // Run colpoint checks
-            m_pColManager->DoHitDetection(pPlayer->GetPosition(), pPlayer);
-            UNCLOCK("PlayerPuresync", "DoHitDetection");
-        }
+        CLOCK("PlayerPuresync", "RelayPlayerPuresync");
+        // Relay to other players
+        RelayPlayerPuresync(Packet);
+        UNCLOCK("PlayerPuresync", "RelayPlayerPuresync");
+
+        CLOCK("PlayerPuresync", "DoHitDetection");
+        // Run colpoint checks
+        m_pColManager->DoHitDetection(pPlayer->GetPosition(), pPlayer);
+        UNCLOCK("PlayerPuresync", "DoHitDetection");
     }
 }
 

Server/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp

@@ -271,9 +271,9 @@ void CUnoccupiedVehicleSync::Packet_UnoccupiedVehicleSync(CUnoccupiedVehicleSync
                 // this packet if the time context matches.
                 if (pVehicle->GetSyncer() == pPlayer && pVehicle->CanUpdateSync(vehicle.data.ucTimeContext))
                 {
-                    // Is there no player driver?
+                    // Is there no player driver, or is he exiting?
                     CPed* pOccupant = pVehicle->GetOccupant(0);
-                    if (!pOccupant || !IS_PLAYER(pOccupant))
+                    if (!pOccupant || !IS_PLAYER(pOccupant) || pOccupant->GetVehicleAction() == CPed::VEHICLEACTION_EXITING)
                     {
                         // Apply the data to the vehicle
                         if (vehicle.data.bSyncPosition)

Server/mods/deathmatch/logic/net/CSimPlayer.h

@@ -42,6 +42,7 @@ class CSimPlayer
     std::multimap<ushort, CSimPlayer*> m_PuresyncSendListGrouped;            // Send list grouped by bitstream version
     bool                               m_bSendListChanged;
     bool                               m_bHasOccupiedVehicle;
+    bool                               m_bIsExitingVehicle;
     CControllerState                   m_sharedControllerState;            // Updated by CSim*Packet code
 
     // Used in CSimPlayerPuresyncPacket and CSimVehiclePuresyncPacket

Server/mods/deathmatch/logic/net/CSimPlayerManager.cpp

@@ -130,6 +130,7 @@ void CSimPlayerManager::UpdateSimPlayer(CPlayer* pPlayer)
     pSim->m_bIsJoined = pPlayer->IsJoined();
     pSim->m_usBitStreamVersion = pPlayer->GetBitStreamVersion();
     pSim->m_bHasOccupiedVehicle = pVehicle != NULL;
+    pSim->m_bIsExitingVehicle = pPlayer->GetVehicleAction() == CPed::VEHICLEACTION_EXITING;
     pSim->m_PlayerID = pPlayer->GetID();
     pSim->m_usLatency = static_cast<unsigned short>(pPlayer->GetPing());
     pSim->m_ucWeaponType = pPlayer->GetWeaponType();
@@ -233,7 +234,7 @@ bool CSimPlayerManager::HandlePlayerPureSync(const NetServerPlayerID& Socket, Ne
     CSimPlayer* pSourceSimPlayer = Get(Socket);
 
     // Check is good for player pure sync
-    if (pSourceSimPlayer && pSourceSimPlayer->IsJoined() && !pSourceSimPlayer->m_bHasOccupiedVehicle)
+    if (pSourceSimPlayer && pSourceSimPlayer->IsJoined() && (!pSourceSimPlayer->m_bHasOccupiedVehicle || pSourceSimPlayer->m_bIsExitingVehicle))
     {
         // Read the incoming packet data
         CSimPlayerPuresyncPacket* pPacket =