Added fix for bullet sync not applying damage to the local player during network interruptions by applying remote calculated damage.

ccw808 · ccw808 · commit 4de6b61250c2 · 2015-06-19T05:08:32.000+01:00
Enable with: setServerConfigSetting( "bad_net_bullet_fix", 1 )
Enable logging with: setServerConfigSetting( "enable_diagnostic", "1010" )
Conflicts:
	MTA10/mods/deathmatch/logic/CPacketHandler.cpp
diff --git a/MTA10/mods/deathmatch/logic/CClientGame.cpp b/MTA10/mods/deathmatch/logic/CClientGame.cpp
diff --git a/MTA10/mods/deathmatch/logic/CClientGame.h b/MTA10/mods/deathmatch/logic/CClientGame.h
@@ -559,6 +559,8 @@ class CClientGame
 public:
     static bool                         StaticProcessPacket             ( unsigned char ucPacketID, NetBitStreamInterface& bitStream );
 
+    bool                                ApplyPedDamageFromGame          ( eWeaponType weaponType, float fDamage, uchar ucHitZone, CClientPed* pDamagedPed, CClientEntity* pInflictingEntity, CEventDamage* pEvent );
+
     bool                                VerifySADataFiles               ( int iEnableClientChecks = 0 );
     void                                DebugElementRender              ( void );
 
diff --git a/MTA10/mods/deathmatch/logic/CNetAPI.cpp b/MTA10/mods/deathmatch/logic/CNetAPI.cpp
@@ -2292,6 +2292,18 @@ void CNetAPI::ReadBulletsync ( CClientPlayer* pPlayer, NetBitStreamInterface& Bi
     uchar ucOrderCounter = 0;
     BitStream.Read ( ucOrderCounter );
 
+    float fDamage = 0;
+    uchar ucHitZone = 0;
+    CClientPlayer* pDamagedPlayer = NULL;
+    if ( BitStream.ReadBit() )
+    {
+        ElementID DamagedPlayerID = INVALID_ELEMENT_ID;
+        BitStream.Read( fDamage );
+        BitStream.Read( ucHitZone );
+        BitStream.Read( DamagedPlayerID );
+        pDamagedPlayer = DynamicCast < CClientPlayer > ( CElementIDs::GetElement( DamagedPlayerID ) );
+    }
+
     // Duplicate bullet check
     {
        bool bIsDuplicate = false;
@@ -2315,7 +2327,7 @@ void CNetAPI::ReadBulletsync ( CClientPlayer* pPlayer, NetBitStreamInterface& Bi
             return;
     }
 
-    pPlayer->DischargeWeapon ( weaponType, vecStart, vecEnd );
+    pPlayer->DischargeWeapon ( weaponType, vecStart, vecEnd, fDamage, ucHitZone, pDamagedPlayer );
 }
 
 
@@ -2344,7 +2356,7 @@ void CNetAPI::ReadWeaponBulletsync ( CClientPlayer* pPlayer, NetBitStreamInterfa
 //
 // Send bulletsync fire button press packet to remote players
 //
-void CNetAPI::SendBulletSyncFire ( eWeaponType weaponType, const CVector& vecStart, const CVector& vecEnd )
+void CNetAPI::SendBulletSyncFire ( eWeaponType weaponType, const CVector& vecStart, const CVector& vecEnd, float fDamage, uchar ucHitZone, CClientPlayer* pRemoteDamagedPlayer )
 {
     // Send a bulletsync packet
     NetBitStreamInterface* pBitStream = g_pNet->AllocateNetBitStream ();
@@ -2357,6 +2369,18 @@ void CNetAPI::SendBulletSyncFire ( eWeaponType weaponType, const CVector& vecSta
 
     pBitStream->Write ( m_ucBulletSyncOrderCounter++ );
 
+    if ( fDamage > 0 && pRemoteDamagedPlayer )
+    {
+        pBitStream->WriteBit ( true );
+        pBitStream->Write ( fDamage );
+        pBitStream->Write ( ucHitZone );
+        pBitStream->Write ( pRemoteDamagedPlayer->GetID() );
+    }
+    else
+    {
+        pBitStream->WriteBit ( false );
+    }
+
     // Send the packet
     g_pNet->SendPacket ( PACKET_ID_PLAYER_BULLETSYNC, pBitStream, PACKET_PRIORITY_MEDIUM, PACKET_RELIABILITY_RELIABLE );
     g_pNet->DeallocateNetBitStream ( pBitStream );
diff --git a/MTA10/mods/deathmatch/logic/CNetAPI.h b/MTA10/mods/deathmatch/logic/CNetAPI.h
@@ -59,7 +59,7 @@ class CNetAPI
 
     void                    AddInterpolation                ( const CVector& vecPosition );
     bool                    GetInterpolation                ( CVector& vecPosition, unsigned short usLatency );
-    void                    SendBulletSyncFire              ( eWeaponType weaponType, const CVector& vecStart, const CVector& vecEnd );
+    void                    SendBulletSyncFire              ( eWeaponType weaponType, const CVector& vecStart, const CVector& vecEnd, float fDamage, uchar ucHitZone, CClientPlayer* pRemoteDamagedPlayer );
     void                    SendBulletSyncCustomWeaponFire  ( CClientWeapon * pWeapon, const CVector& vecStart, const CVector& vecEnd );
     bool                    IsNetworkTrouble                ( void )            { return m_bIsNetworkTrouble; }
 
diff --git a/MTA10/mods/deathmatch/logic/CPacketHandler.cpp b/MTA10/mods/deathmatch/logic/CPacketHandler.cpp
@@ -2545,7 +2545,10 @@ void CPacketHandler::Packet_PlayerNetworkStatus ( NetBitStreamInterface& bitStre
         Arguments.PushNumber ( uiTicks );   // Ticks since interruption start
         CClientPlayer* pLocalPlayer = g_pClientGame->m_pPlayerManager->GetLocalPlayer ();
         if ( pLocalPlayer )
+        {
+            pLocalPlayer->SetIsInNetworkInterruption( ucType == 0 );
             pLocalPlayer->CallEvent ( "onClientPlayerNetworkStatus", Arguments, false );
+        }
     }
 }
 
diff --git a/MTA10/mods/shared_logic/CClientPlayer.cpp b/MTA10/mods/shared_logic/CClientPlayer.cpp
@@ -17,6 +17,8 @@
 
 #include <StdInc.h>
 int g_iDamageEventLimit = -1;
+extern float g_fApplyDamageLastAmount;
+extern CClientPed* g_pApplyDamageLastDamagedPed;
 
 CClientPlayer::CClientPlayer ( CClientManager* pManager, ElementID ID, bool bIsLocalPlayer ) : ClassInit ( this ), CClientPed ( pManager, 0, ID, bIsLocalPlayer )
 {
@@ -259,10 +261,13 @@ void CClientPlayer::SetNametagText ( const char * szText )
 }
 
 
-void CClientPlayer::DischargeWeapon ( eWeaponType weaponType, const CVector& vecStart, const CVector& vecEnd )
+void CClientPlayer::DischargeWeapon ( eWeaponType weaponType, const CVector& vecStart, const CVector& vecEnd, float fBackupDamage, uchar ucBackupHitZone, CClientPlayer* pBackupDamagedPlayer )
 {
     if ( m_pPlayerPed )
     {
+        g_pApplyDamageLastDamagedPed = NULL;
+        g_fApplyDamageLastAmount = 0;
+
         // Check weapon matches and is enabled for bullet sync
         if ( weaponType == GetCurrentWeaponType () &&
              g_pClientGame->GetWeaponTypeUsesBulletSync ( weaponType ) )
@@ -280,6 +285,40 @@ void CClientPlayer::DischargeWeapon ( eWeaponType weaponType, const CVector& vec
 
             m_shotSyncData->m_bRemoteBulletSyncVectorsValid = false;
         }
+
+        // Apply extra damage if player has bad network
+        if ( pBackupDamagedPlayer && pBackupDamagedPlayer->GetGamePlayer() && pBackupDamagedPlayer->GetWasRecentlyInNetworkInterruption( 1000 ) )
+        {
+            // Subtract any damage that did get applied during FireBullet
+            if ( pBackupDamagedPlayer == g_pApplyDamageLastDamagedPed )
+                fBackupDamage -= g_fApplyDamageLastAmount;
+
+            if ( fBackupDamage > 0 )
+            {
+                // Apply left over damage like what the game would:
+                //      CClientPlayer has pre damage health/armor
+                //      CPlayerPed has post damage health/armor
+
+                float fPreviousHealth = pBackupDamagedPlayer->m_fHealth;
+                float fPreviousArmor = pBackupDamagedPlayer->m_fArmor;
+
+                // Calculate how much damage should be applied to health/armor
+                float fArmorDamage = Min( fBackupDamage, pBackupDamagedPlayer->m_fArmor ); 
+                float fHealthDamage = Min( fBackupDamage - fArmorDamage, pBackupDamagedPlayer->m_fHealth );
+
+                float fNewArmor = pBackupDamagedPlayer->m_fArmor - fArmorDamage;
+                float fNewHealth = pBackupDamagedPlayer->m_fHealth - fHealthDamage;
+
+                // Ensure CPlayerPed has post damage health/armor
+                pBackupDamagedPlayer->GetGamePlayer()->SetHealth( fNewHealth );
+                pBackupDamagedPlayer->GetGamePlayer()->SetArmor( fNewArmor );
+
+                g_pClientGame->ApplyPedDamageFromGame( weaponType, fBackupDamage, ucBackupHitZone, pBackupDamagedPlayer, this, NULL );
+
+                SString strMessage( "Applied %0.2f damage to %s (from %s) due to network interruption", fBackupDamage, pBackupDamagedPlayer->GetNick(), GetNick() );
+                g_pClientGame->TellServerSomethingImportant( 1010, strMessage, false );
+            }
+        }
     }
 }
 
@@ -299,3 +338,17 @@ uint CClientPlayer::GetRemoteBuildNumber ( void )
 {
     return m_uiRemoteBuildNumber;
 }
+
+bool CClientPlayer::GetWasRecentlyInNetworkInterruption ( uint uiMaxTicksAgo )
+{
+    if ( m_bInNetworkInterruption )
+        return true;
+    return m_TimeSinceNetworkInterruptionEnded.Get() < uiMaxTicksAgo;
+}
+
+void CClientPlayer::SetIsInNetworkInterruption ( bool bBegan )
+{
+    m_bInNetworkInterruption = bBegan;
+    if ( !bBegan )
+        m_TimeSinceNetworkInterruptionEnded.Reset();
+}
diff --git a/MTA10/mods/shared_logic/CClientPlayer.h b/MTA10/mods/shared_logic/CClientPlayer.h
@@ -109,11 +109,13 @@ class CClientPlayer : public CClientPed
     
     inline CClientManager*          GetManager              ( void )                                { return m_pManager; }
 
-    void                            DischargeWeapon         ( eWeaponType weaponType, const CVector& vecStart, const CVector& vecEnd );
+    void                            DischargeWeapon         ( eWeaponType weaponType, const CVector& vecStart, const CVector& vecEnd, float fBackupDamage, uchar ucBackupHitZone, CClientPlayer* pBackupDamagedPlayer );
 
     void                            SetRemoteVersionInfo        ( ushort usBitstreamVersion, uint uiBuildNumber );
     ushort                          GetRemoteBitstreamVersion   ( void );
     uint                            GetRemoteBuildNumber        ( void );
+    bool                            GetWasRecentlyInNetworkInterruption  ( uint uiMaxTicksAgo );
+    void                            SetIsInNetworkInterruption  ( bool bInNetworkInterruption );
 
     CVector                         m_vecPrevBulletSyncStart;
     CVector                         m_vecPrevBulletSyncEnd;
@@ -168,6 +170,8 @@ class CClientPlayer : public CClientPed
     CVector                         m_vecLightsyncCalcedVelocity;
     ushort                          m_usRemoteBitstreamVersion;
     uint                            m_uiRemoteBuildNumber;
+    bool                            m_bInNetworkInterruption;
+    CElapsedTime                    m_TimeSinceNetworkInterruptionEnded;
 
 #ifdef MTA_DEBUG
 private:
diff --git a/MTA10_Server/mods/deathmatch/logic/CGame.cpp b/MTA10_Server/mods/deathmatch/logic/CGame.cpp
@@ -2268,6 +2268,11 @@ void CGame::Packet_Bulletsync ( CBulletsyncPacket& Packet )
     CPlayer* pPlayer = Packet.GetSourcePlayer ();
     if ( pPlayer && pPlayer->IsJoined () )
     {
+        // Remove bad net fix data if disabled
+        if ( !GetConfig()->GetBadNetBulletFixEnabled() )
+        {
+            Packet.m_DamagedPlayerID = INVALID_ELEMENT_ID;
+        }
         // Relay to other players
         RelayNearbyPacket ( Packet );
     }
diff --git a/MTA10_Server/mods/deathmatch/logic/CMainConfig.cpp b/MTA10_Server/mods/deathmatch/logic/CMainConfig.cpp
@@ -355,7 +355,7 @@ bool CMainConfig::Load ( void )
 
     {
         SString strEnable;
-        GetString ( m_pRootNode, "enablediagnostic", strEnable );
+        GetString ( m_pRootNode, "enable_diagnostic", strEnable );
         strEnable = strEnable.Replace( " ", "" );
         std::vector < SString > tagList;
         strEnable.Split ( ",", tagList );
@@ -1167,6 +1167,14 @@ bool CMainConfig::GetSetting ( const SString& strName, SString& strValue )
         return false;
     }
     else
+    if ( strName == "enable_diagnostic" )
+    {
+        for ( std::set < SString >::iterator iter = m_EnableDiagnosticMap.begin() ; iter != m_EnableDiagnosticMap.end() ; ++iter )
+            strValue += *iter + ",";
+        strValue = strValue.TrimEnd( "," );
+        return true;
+    }
+    else
     {
         // Check settings in this list here
         const std::vector < SIntSetting >& settingList = GetIntSettingList ();
@@ -1358,6 +1366,27 @@ bool CMainConfig::SetSetting ( const SString& strName, const SString& strValue,
         Save ();
         return true;
     }
+    else
+    if ( strName == "enable_diagnostic" )
+    {
+        if ( true )
+        {
+            m_EnableDiagnosticMap.clear();
+            SString strEnableDiagnostic = strValue.Replace( " ", "" );
+            std::vector < SString > tagList;
+            strEnableDiagnostic.Split ( ",", tagList );
+            for ( std::vector < SString >::iterator it = tagList.begin () ; it != tagList.end () ; ++it )
+            if ( (*it).length () )
+                MapInsert ( m_EnableDiagnosticMap, *it );
+
+            if ( bSave )
+            {
+                SetString ( m_pRootNode, "enable_diagnostic", strEnableDiagnostic );
+                Save ();
+            }
+            return true;
+        }
+    }
 
     // Check settings in this list here
     const std::vector < SIntSetting >& settingList = GetIntSettingList ();
@@ -1423,6 +1452,7 @@ const std::vector < SIntSetting >& CMainConfig::GetIntSettingList ( void )
             { false, false, 0,      1,      2,      "compact_internal_databases",           &m_iCompactInternalDatabases,               NULL },
             { true, true,   0,      1,      2,      "minclientversion_auto_update",         &m_iMinClientVersionAutoUpdate,             NULL },
             { true, true,   0,      0,      100,    "server_logic_fps_limit",               &m_iServerLogicFpsLimit,                    NULL },
+            { true, true,   0,      0,      1,      "bad_net_bullet_fix",                   &m_bBadNetBulletFixEnabled,                 NULL },
         };
 
     static std::vector < SIntSetting > settingsList;
diff --git a/MTA10_Server/mods/deathmatch/logic/CMainConfig.h b/MTA10_Server/mods/deathmatch/logic/CMainConfig.h
@@ -124,6 +124,7 @@ class CMainConfig: public CXMLConfig
     bool                            GetUseAltPulseOrder             ( void ) const              { return m_bUseAltPulseOrder != 0; }
     const SString&                  GetLoadstringLogFilename        ( void ) const              { return m_strLoadstringLogFilename; }
     bool                            GetLoadstringLogEnabled         ( void ) const              { return !m_strLoadstringLogFilename.empty(); }
+    bool                            GetBadNetBulletFixEnabled       ( void ) const              { return m_bBadNetBulletFixEnabled != 0; }
 
     SString                         GetSetting                      ( const SString& configSetting );
     bool                            GetSetting                      ( const SString& configSetting, SString& strValue );
@@ -213,6 +214,7 @@ class CMainConfig: public CXMLConfig
     SString                         m_strLoadstringLogFilename;
     int                             m_iMinClientVersionAutoUpdate;
     int                             m_iServerLogicFpsLimit;
+    int                             m_bBadNetBulletFixEnabled;
 };
 
 #endif
diff --git a/MTA10_Server/mods/deathmatch/logic/net/CSimBulletsyncPacket.cpp b/MTA10_Server/mods/deathmatch/logic/net/CSimBulletsyncPacket.cpp
@@ -15,6 +15,9 @@ CSimBulletsyncPacket::CSimBulletsyncPacket ( ElementID PlayerID )
     : m_PlayerID ( PlayerID )
 {
     m_Cache.ucOrderCounter = 0;
+    m_Cache.fDamage = 0;
+    m_Cache.ucHitZone = 0;
+    m_Cache.DamagedPlayerID = INVALID_ELEMENT_ID;
 }
 
 
@@ -34,6 +37,13 @@ bool CSimBulletsyncPacket::Read ( NetBitStreamInterface& BitStream )
     if ( !BitStream.Read ( m_Cache.ucOrderCounter ) )
         return false;
 
+    if ( BitStream.ReadBit() )
+    {
+        BitStream.Read ( m_Cache.fDamage );
+        BitStream.Read ( m_Cache.ucHitZone );
+        BitStream.Read ( m_Cache.DamagedPlayerID );
+    }
+
     return true;
 }
 
@@ -54,5 +64,17 @@ bool CSimBulletsyncPacket::Write ( NetBitStreamInterface& BitStream ) const
     // Duplicate packet protection
     BitStream.Write ( m_Cache.ucOrderCounter );
 
+    if ( m_Cache.fDamage > 0 && m_Cache.DamagedPlayerID != INVALID_ELEMENT_ID )
+    {
+        BitStream.WriteBit ( true );
+        BitStream.Write ( m_Cache.fDamage );
+        BitStream.Write ( m_Cache.ucHitZone );
+        BitStream.Write ( m_Cache.DamagedPlayerID );
+    }
+    else
+    {
+        BitStream.WriteBit ( false );
+    }
+
     return true;
 }
diff --git a/MTA10_Server/mods/deathmatch/logic/net/CSimBulletsyncPacket.h b/MTA10_Server/mods/deathmatch/logic/net/CSimBulletsyncPacket.h
@@ -35,6 +35,9 @@ class CSimBulletsyncPacket : public CSimPacket
         CVector     vecStart;
         CVector     vecEnd;
         uchar       ucOrderCounter;
+        float       fDamage;
+        uchar       ucHitZone;
+        ElementID   DamagedPlayerID;
     } m_Cache;
 
 };
diff --git a/MTA10_Server/mods/deathmatch/logic/net/CSimPlayerManager.cpp b/MTA10_Server/mods/deathmatch/logic/net/CSimPlayerManager.cpp
@@ -383,6 +383,12 @@ bool CSimPlayerManager::HandleBulletSync ( const NetServerPlayerID& Socket, NetB
 
         if ( pPacket->Read ( *BitStream ) )
         {
+            // Remove bad net fix data if disabled
+            if ( !g_pGame->GetConfig()->GetBadNetBulletFixEnabled() )
+            {
+                pPacket->m_Cache.DamagedPlayerID = INVALID_ELEMENT_ID;
+            }
+
             // Relay it to nearbyers
             Broadcast ( *pPacket, pSourceSimPlayer->GetPuresyncSendList () );
         }
diff --git a/MTA10_Server/mods/deathmatch/logic/packets/CBulletsyncPacket.cpp b/MTA10_Server/mods/deathmatch/logic/packets/CBulletsyncPacket.cpp
@@ -16,6 +16,9 @@ CBulletsyncPacket::CBulletsyncPacket ( CPlayer * pPlayer )
     m_pSourceElement = pPlayer;
     m_WeaponType = WEAPONTYPE_UNARMED;
     m_ucOrderCounter = 0;
+    m_fDamage = 0;
+    m_ucHitZone = 0;
+    m_DamagedPlayerID = INVALID_ELEMENT_ID;
 }
 
 bool CBulletsyncPacket::Read ( NetBitStreamInterface& BitStream )
@@ -34,6 +37,12 @@ bool CBulletsyncPacket::Read ( NetBitStreamInterface& BitStream )
         if ( !BitStream.Read ( m_ucOrderCounter ) )
             return false;
 
+        if ( BitStream.ReadBit() )
+        {
+            BitStream.Read ( m_fDamage );
+            BitStream.Read ( m_ucHitZone );
+            BitStream.Read ( m_DamagedPlayerID );
+        }
         return true;
     }
 
@@ -60,6 +69,19 @@ bool CBulletsyncPacket::Write ( NetBitStreamInterface& BitStream ) const
 
         // Duplicate packet protection
         BitStream.Write ( m_ucOrderCounter );
+
+        if ( m_fDamage > 0 && m_DamagedPlayerID != INVALID_ELEMENT_ID )
+        {
+            BitStream.WriteBit ( true );
+            BitStream.Write ( m_fDamage );
+            BitStream.Write ( m_ucHitZone );
+            BitStream.Write ( m_DamagedPlayerID );
+        }
+        else
+        {
+            BitStream.WriteBit ( false );
+        }
+
         return true;
     }
 
diff --git a/MTA10_Server/mods/deathmatch/logic/packets/CBulletsyncPacket.h b/MTA10_Server/mods/deathmatch/logic/packets/CBulletsyncPacket.h
@@ -26,5 +26,8 @@ class CBulletsyncPacket : public CPacket
     CVector                 m_vecStart;
     CVector                 m_vecEnd;
     uchar                   m_ucOrderCounter;
+    float                   m_fDamage;
+    uchar                   m_ucHitZone;
+    ElementID               m_DamagedPlayerID;
 };
 

Original file line number	Diff line number	Diff line change
`@@ -2545,7 +2545,10 @@ void CPacketHandler::Packet_PlayerNetworkStatus ( NetBitStreamInterface& bitStre`
`2545`	`2545`	`Arguments.PushNumber ( uiTicks ); // Ticks since interruption start`
`2546`	`2546`	`CClientPlayer* pLocalPlayer = g_pClientGame->m_pPlayerManager->GetLocalPlayer ();`
`2547`	`2547`	`if ( pLocalPlayer )`
	`2548`	`+ {`
	`2549`	`+ pLocalPlayer->SetIsInNetworkInterruption( ucType == 0 );`
`2548`	`2550`	`pLocalPlayer->CallEvent ( "onClientPlayerNetworkStatus", Arguments, false );`
	`2551`	`+ }`
`2549`	`2552`	`}`
`2550`	`2553`	`}`
`2551`	`2554`
Original file line number	Diff line number	Diff line change
`@@ -2268,6 +2268,11 @@ void CGame::Packet_Bulletsync ( CBulletsyncPacket& Packet )`
`2268`	`2268`	`CPlayer* pPlayer = Packet.GetSourcePlayer ();`
`2269`	`2269`	`if ( pPlayer && pPlayer->IsJoined () )`
`2270`	`2270`	`{`
	`2271`	`+ // Remove bad net fix data if disabled`
	`2272`	`+ if ( !GetConfig()->GetBadNetBulletFixEnabled() )`
	`2273`	`+ {`
	`2274`	`+ Packet.m_DamagedPlayerID = INVALID_ELEMENT_ID;`
	`2275`	`+ }`
`2271`	`2276`	`// Relay to other players`
`2272`	`2277`	`RelayNearbyPacket ( Packet );`
`2273`	`2278`	`}`