Enforce server-side jetpack state

Server/mods/deathmatch/logic/CGame.cpp

@@ -2133,6 +2133,7 @@ void CGame::Packet_PlayerWasted(CPlayerWastedPacket& Packet)
         pPlayer->SetHealth(0.0f);
         pPlayer->SetArmor(0.0f);
         pPlayer->SetPosition(Packet.m_vecPosition);
+        pPlayer->SetHasJetPack(false);
 
         // Reset his vehicle action, but only if not jacking
         // If jacking we wait for him to reply with VEHICLE_NOTIFY_JACK_ABORT

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

@@ -50,6 +50,7 @@ class CSimPlayer
     ushort    m_usLatency;
     uchar     m_ucSyncTimeContext;
     uchar     m_ucWeaponType;
+    bool      m_bHasJetPack;
 
     // Used in CSimVehiclePuresyncPacket
     ushort                m_usVehicleModel;

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

@@ -141,6 +141,8 @@ void CSimPlayerManager::UpdateSimPlayer(CPlayer* pPlayer)
     pSim->m_bVehicleHasHydraulics = pVehicle ? pVehicle->GetUpgrades()->HasUpgrade(1087) : false;
     pSim->m_bVehicleIsPlaneOrHeli = pVehicle ? pVehicle->GetVehicleType() == VEHICLE_PLANE || pVehicle->GetVehicleType() == VEHICLE_HELI : false;
     pSim->m_sharedControllerState.Copy(pPlayer->GetPad()->GetCurrentControllerState());
+    pSim->m_bHasJetPack = pPlayer->HasJetPack();
+
     if (pVehicle)
     {
         pSim->m_uiVehicleDamageInfoSendPhase = pVehicle->m_uiDamageInfoSendPhase;
@@ -239,7 +241,7 @@ bool CSimPlayerManager::HandlePlayerPureSync(const NetServerPlayerID& Socket, Ne
         // Read the incoming packet data
         CSimPlayerPuresyncPacket* pPacket =
             new CSimPlayerPuresyncPacket(pSourceSimPlayer->m_PlayerID, pSourceSimPlayer->m_usLatency, pSourceSimPlayer->m_ucSyncTimeContext,
-                                         pSourceSimPlayer->m_ucWeaponType, pSourceSimPlayer->m_fWeaponRange, pSourceSimPlayer->m_sharedControllerState);
+                                         pSourceSimPlayer->m_ucWeaponType, pSourceSimPlayer->m_fWeaponRange, pSourceSimPlayer->m_sharedControllerState, pSourceSimPlayer->m_bHasJetPack);
         if (pPacket->Read(*BitStream))
         {
             // Relay it to nearbyers

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

@@ -13,14 +13,15 @@
 #include "CWeaponNames.h"
 
 CSimPlayerPuresyncPacket::CSimPlayerPuresyncPacket(ElementID PlayerID, ushort PlayerLatency, uchar PlayerSyncTimeContext, uchar PlayerGotWeaponType,
-                                                   float WeaponRange, CControllerState& sharedControllerState)
+                                                   float WeaponRange, CControllerState& sharedControllerState, bool bHasJetPack)
 
     : m_PlayerID(PlayerID),
       m_PlayerLatency(PlayerLatency),
       m_PlayerSyncTimeContext(PlayerSyncTimeContext),
       m_PlayerGotWeaponType(PlayerGotWeaponType),
       m_WeaponRange(WeaponRange),
-      m_sharedControllerState(sharedControllerState)
+      m_sharedControllerState(sharedControllerState),
+      m_bHasJetPack(bHasJetPack)
 {
 }
 
@@ -179,6 +180,9 @@ bool CSimPlayerPuresyncPacket::Read(NetBitStreamInterface& BitStream)
         m_Cache.usTotalAmmo = 1;
     }
 
+    // Enforce we use server-side jetpack state
+    m_Cache.flags.data.bHasJetPack = m_bHasJetPack;
+
     // Success
     return true;
 }

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

@@ -34,7 +34,7 @@ class CSimPlayerPuresyncPacket : public CSimPacket
     ZERO_ON_NEW
 
     CSimPlayerPuresyncPacket(ElementID PlayerID, ushort PlayerLatency, uchar PlayerSyncTimeContext, uchar PlayerGotWeaponType, float WeaponRange,
-                             CControllerState& sharedControllerState);
+                             CControllerState& sharedControllerState, bool bHasJetPack);
 
     ePacketID     GetPacketID() const { return PACKET_ID_PLAYER_PURESYNC; };
     unsigned long GetFlags() const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; };
@@ -56,6 +56,7 @@ class CSimPlayerPuresyncPacket : public CSimPacket
     const uchar       m_PlayerGotWeaponType;
     const float       m_WeaponRange;
     CControllerState& m_sharedControllerState;
+    const bool        m_bHasJetPack;
 
     // Set in Read ()
     struct

Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.cpp

@@ -54,7 +54,6 @@ bool CPlayerPuresyncPacket::Read(NetBitStreamInterface& BitStream)
 
         pSourcePlayer->SetInWater(flags.data.bIsInWater);
         pSourcePlayer->SetOnGround(flags.data.bIsOnGround);
-        pSourcePlayer->SetHasJetPack(flags.data.bHasJetPack);
         pSourcePlayer->SetDucked(flags.data.bIsDucked);
         pSourcePlayer->SetWearingGoggles(flags.data.bWearsGoogles);
         pSourcePlayer->SetChoking(flags.data.bIsChoking);