mtaserver.conf settings

FileEX · FileEX · commit 16b261df47ed · 2025-08-24T17:21:18.000+02:00
diff --git a/Client/game_sa/CPedSA.cpp b/Client/game_sa/CPedSA.cpp
@@ -20,6 +20,7 @@
 #include "CProjectileInfoSA.h"
 #include "CWeaponStatManagerSA.h"
 #include "CFireManagerSA.h"
+#include "CAnimManagerSA.h"
 
 extern CGameSA* pGame;
 
@@ -576,6 +577,25 @@ void CPedSA::GetAttachedSatchels(std::vector<SSatchelsData>& satchelsList) const
     }
 }
 
+bool CPedSA::IsPedCuttingWithChainsaw() const
+{
+    if (GetPedIntelligence()->GetTaskManager()->GetActiveTask()->GetTaskType() == TASK_SIMPLE_FIGHT)
+    {
+        CPedSAInterface* gamePed = GetPedInterface();
+
+        if (gamePed->weaponAudioEntity.m_chainsawState == eChainsawState::CUTTING)
+        {
+            auto cuttingAnim = pGame->GetAnimManager()->RpAnimBlendClumpGetAssociation(gamePed->m_pRwObject, "csaw_g");
+            if (!cuttingAnim)
+                cuttingAnim = pGame->GetAnimManager()->RpAnimBlendClumpGetAssociation(gamePed->m_pRwObject, "csaw_part");
+
+            return cuttingAnim != nullptr;
+        }
+    }
+
+    return false;
+}
+
 ////////////////////////////////////////////////////////////////
 //
 // CPed_PreRenderAfterTest
diff --git a/Client/game_sa/CPedSA.h b/Client/game_sa/CPedSA.h
@@ -475,6 +475,8 @@ class CPedSA : public virtual CPed, public virtual CPhysicalSA
 
     void GetAttachedSatchels(std::vector<SSatchelsData> &satchelsList) const override;
 
+    bool IsPedCuttingWithChainsaw() const override;
+
     static void StaticSetHooks();
 
 private:
diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
@@ -74,7 +74,6 @@ CVector             g_vecBulletFireEndPosition;
 #define DOUBLECLICK_MOVE_THRESHOLD   10.0f
 
 static constexpr long long TIME_DISCORD_UPDATE_RATE = 15000;
-static constexpr int       CANCEL_DAMAGE_EVENT_INTERVAL = 1000;
 
 CClientGame::CClientGame(bool bLocalPlay) : m_ServerInfo(new CServerInfo())
 {
@@ -4430,30 +4429,65 @@ bool CClientGame::ApplyPedDamageFromGame(eWeaponType weaponUsed, float fDamage,
             pDamagedPed->GetGamePlayer()->SetHealth(fPreviousHealth);
             pDamagedPed->GetGamePlayer()->SetArmor(fPreviousArmor);
 
-            if (GetTickCount64_() - m_lastCancelDamageEventTime_Ped >= CANCEL_DAMAGE_EVENT_INTERVAL && weaponUsed != eWeaponType::WEAPONTYPE_DROWNING)
+            if (GetTickCount64_() - pDamagedPed->m_lastEventDamageCancelledTime >= g_TickRateSettings.cancelledDamageInterval)
             {
-                NetBitStreamInterface* bitStream = g_pNet->AllocateNetBitStream();
+                bool sendPacket = true;
+
+                if (!m_triggerEventDamageCancelledForDamageEveryFrame)
+                {
+                    switch (weaponUsed)
+                    {
+                        case WEAPONTYPE_TEARGAS:
+                        case WEAPONTYPE_SPRAYCAN:
+                        case WEAPONTYPE_EXTINGUISHER:
+                        case WEAPONTYPE_FLAMETHROWER:
+                        case WEAPONTYPE_MOLOTOV:
+                        case WEAPONTYPE_DROWNING:
+                        case WEAPONTYPE_MINIGUN:
+                        case WEAPONTYPE_RUNOVERBYCAR:
+                        {
+                            sendPacket = false;
+                            break;
+                        }
+                        case WEAPONTYPE_CHAINSAW:
+                        {
+                            if (pInflictingEntity && pInflictingEntity->GetType() == eClientEntityType::CCLIENTPED || pInflictingEntity->GetType() == eClientEntityType::CCLIENTPLAYER)
+                            {
+                                CClientPed* attackerPed = static_cast<CClientPed*>(pInflictingEntity);
+                                if (!attackerPed->m_pPlayerPed || !attackerPed->m_pPlayerPed->IsPedCuttingWithChainsaw())
+                                    sendPacket = false;
+                            }
+
+                            break;
+                        }
+                    }
+                }
 
-                bitStream->Write(pDamagedPed->GetID());
+                if (sendPacket)
+                {
+                    NetBitStreamInterface* bitStream = g_pNet->AllocateNetBitStream();
 
-                bitStream->WriteBit(pInflictingEntity != nullptr);
-                if (pInflictingEntity)
-                    bitStream->Write(pInflictingEntity->GetID());
+                    bitStream->Write(pDamagedPed->GetID());
 
-                SWeaponTypeSync weapon;
-                weapon.data.ucWeaponType = weaponUsed;
-                bitStream->Write(&weapon);
+                    bitStream->WriteBit(pInflictingEntity != nullptr);
+                    if (pInflictingEntity)
+                        bitStream->Write(pInflictingEntity->GetID());
 
-                SFloatSync<8, 10> damage;
-                damage.data.fValue = fDamage;
-                bitStream->Write(&damage);
+                    SWeaponTypeSync weapon;
+                    weapon.data.ucWeaponType = weaponUsed;
+                    bitStream->Write(&weapon);
 
-                bitStream->WriteString(m_pLuaManager->GetEvents()->GetEventCancellingResourceName());
+                    SFloatSync<8, 10> damage;
+                    damage.data.fValue = fDamage;
+                    bitStream->Write(&damage);
 
-                g_pNet->SendPacket(PACKET_ID_CANCEL_DAMAGE_EVENT, bitStream, PACKET_PRIORITY_HIGH, PACKET_RELIABILITY_RELIABLE_ORDERED);
-                g_pNet->DeallocateNetBitStream(bitStream);
+                    bitStream->WriteString(m_pLuaManager->GetEvents()->GetEventCancellingResourceName());
 
-                m_lastCancelDamageEventTime_Ped = GetTickCount64_();
+                    g_pNet->SendPacket(PACKET_ID_CANCEL_DAMAGE_EVENT, bitStream, PACKET_PRIORITY_HIGH, PACKET_RELIABILITY_RELIABLE_ORDERED);
+                    g_pNet->DeallocateNetBitStream(bitStream);
+
+                    pDamagedPed->m_lastEventDamageCancelledTime = GetTickCount64_();
+                }
             }
 
             return false;
@@ -4816,12 +4850,16 @@ bool CClientGame::VehicleDamageHandler(CEntitySAInterface* pVehicleInterface, fl
         {
             bAllowDamage = false;
 
-            if (GetTickCount64_() - m_lastCancelDamageEventTime_Vehicle >= CANCEL_DAMAGE_EVENT_INTERVAL)
+            if (m_triggerEventDamageCancelledForVehicles && GetTickCount64_() - pClientVehicle->m_lastEventDamageCancelledTime >= g_TickRateSettings.cancelledDamageInterval)
             {
                 NetBitStreamInterface* bitStream = g_pNet->AllocateNetBitStream();
 
                 bitStream->Write(pClientVehicle->GetID());
 
+                bitStream->WriteBit(pClientAttacker != nullptr);
+                if (pClientAttacker)
+                    bitStream->Write(pClientAttacker->GetID());
+
                 SWeaponTypeSync weapon;
                 weapon.data.ucWeaponType = weaponType;
                 bitStream->Write(&weapon);
@@ -4835,7 +4873,7 @@ bool CClientGame::VehicleDamageHandler(CEntitySAInterface* pVehicleInterface, fl
                 g_pNet->SendPacket(PACKET_ID_CANCEL_DAMAGE_EVENT, bitStream, PACKET_PRIORITY_HIGH, PACKET_RELIABILITY_RELIABLE_ORDERED);
                 g_pNet->DeallocateNetBitStream(bitStream);
 
-                m_lastCancelDamageEventTime_Vehicle = GetTickCount64_();
+                pClientVehicle->m_lastEventDamageCancelledTime = GetTickCount64_();
             }
         }
     }
diff --git a/Client/mods/deathmatch/logic/CClientGame.h b/Client/mods/deathmatch/logic/CClientGame.h
@@ -664,6 +664,12 @@ class CClientGame
     void PedStepHandler(CPedSAInterface* pPed, bool bFoot);
     void VehicleWeaponHitHandler(SVehicleWeaponHitEvent& event);
 
+    void SetEventDamageCancelledSettings(bool calledForVehicles, bool calledForDmgEveryFrame) noexcept
+    {
+        m_triggerEventDamageCancelledForVehicles = calledForVehicles;
+        m_triggerEventDamageCancelledForDamageEveryFrame = calledForDmgEveryFrame;
+    }
+
 private:
     eStatus       m_Status;
     eServerType   m_ServerType;
@@ -874,8 +880,9 @@ class CClientGame
     RunNamedAnimTask_type m_mapOfRunNamedAnimTasks;
     
     long long m_timeLastDiscordStateUpdate;
-    std::int64_t m_lastCancelDamageEventTime_Ped;
-    std::int64_t m_lastCancelDamageEventTime_Vehicle;
+
+    bool m_triggerEventDamageCancelledForVehicles;
+    bool m_triggerEventDamageCancelledForDamageEveryFrame;
 };
 
 extern CClientGame* g_pClientGame;
diff --git a/Client/mods/deathmatch/logic/CClientPed.h b/Client/mods/deathmatch/logic/CClientPed.h
@@ -740,6 +740,7 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
     uint                                     m_uiFrameLastRebuildPlayer;
     bool                                     m_bIsSyncing;
     bool                                     m_shouldRecreate{false};
+    std::int64_t                             m_lastEventDamageCancelledTime{0};
 
     bool             m_bBulletImpactData;
     CClientEntityPtr m_pBulletImpactEntity;
diff --git a/Client/mods/deathmatch/logic/CClientVehicle.h b/Client/mods/deathmatch/logic/CClientVehicle.h
@@ -760,4 +760,6 @@ class CClientVehicle : public CClientStreamElement
 
     std::array<CVector, static_cast<std::size_t>(VehicleDummies::VEHICLE_DUMMY_COUNT)> m_dummyPositions;
     bool                                     m_copyDummyPositions = true;
+
+    std::int64_t m_lastEventDamageCancelledTime{0};
 };
diff --git a/Client/mods/deathmatch/logic/CPacketHandler.cpp b/Client/mods/deathmatch/logic/CPacketHandler.cpp
@@ -5482,6 +5482,14 @@ void CPacketHandler::Packet_SyncSettings(NetBitStreamInterface& bitStream)
     uchar ucAllowShotgunDamageFix = 0;
     bitStream.Read(ucAllowShotgunDamageFix);
 
+    bool triggerEventDamageCancelledForVehicles;
+    bitStream.ReadBit(triggerEventDamageCancelledForVehicles);
+
+    bool triggerEventDamageCancelledForDamageEveryFrame;
+    bitStream.ReadBit(triggerEventDamageCancelledForDamageEveryFrame);
+
+    g_pClientGame->SetEventDamageCancelledSettings(triggerEventDamageCancelledForVehicles, triggerEventDamageCancelledForDamageEveryFrame);
+
     SMiscGameSettings miscGameSettings;
     miscGameSettings.bUseAltPulseOrder = (ucUseAltPulseOrder != 0);
     miscGameSettings.bAllowFastSprintFix = (ucAllowFastSprintFix != 0);
diff --git a/Client/mods/deathmatch/logic/rpc/CWorldRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CWorldRPCs.cpp
@@ -603,6 +603,7 @@ void CWorldRPCs::SetSyncIntervals(NetBitStreamInterface& bitStream)
     bitStream.Read(g_TickRateSettings.iKeySyncAnalogMove);
     bitStream.Read(g_TickRateSettings.iPedSyncerDistance);
     bitStream.Read(g_TickRateSettings.iUnoccupiedVehicleSyncerDistance);
+    bitStream.Read(g_TickRateSettings.cancelledDamageInterval);
 }
 
 void CWorldRPCs::SetMoonSize(NetBitStreamInterface& bitStream)
diff --git a/Client/sdk/game/CPed.h b/Client/sdk/game/CPed.h
@@ -307,4 +307,6 @@ class CPed : public virtual CPhysical
     virtual void GetAttachedSatchels(std::vector<SSatchelsData> &satchelsList) const = 0;
 
     virtual void Say(const ePedSpeechContext& speechId, float probability) = 0;
+
+    virtual bool IsPedCuttingWithChainsaw() const = 0;
 };
diff --git a/Server/mods/deathmatch/logic/CGame.cpp b/Server/mods/deathmatch/logic/CGame.cpp
@@ -4757,8 +4757,10 @@ void CGame::SendSyncSettings(CPlayer* pPlayer)
     uchar ucAllowDrivebyAnimFix = true;
     uchar ucAllowShotgunDamageFix = true;
 
+    const SEVentDamageCancelledSettings& damageCancelledSettings = m_pMainConfig->GetEventDamageCancelledSettings();
+
     CSyncSettingsPacket packet(weaponTypesUsingBulletSync, ucVehExtrapolateEnabled, sVehExtrapolateBaseMs, sVehExtrapolatePercent, sVehExtrapolateMaxMs,
-                               ucUseAltPulseOrder, ucAllowFastSprintFix, ucAllowDrivebyAnimFix, ucAllowShotgunDamageFix);
+                               ucUseAltPulseOrder, ucAllowFastSprintFix, ucAllowDrivebyAnimFix, ucAllowShotgunDamageFix, damageCancelledSettings.triggerOnVehicleDamage == 1, damageCancelledSettings.triggerForDamageCalledEveryFrame == 1);
     if (pPlayer)
         pPlayer->Send(packet);
     else
diff --git a/Server/mods/deathmatch/logic/CMainConfig.cpp b/Server/mods/deathmatch/logic/CMainConfig.cpp
@@ -540,6 +540,9 @@ bool CMainConfig::Load()
     GetBoolean(m_pRootNode, "elementdata_whitelisted", m_elementDataWhitelisted);
     GetBoolean(m_pRootNode, "check_duplicate_serials", m_checkDuplicateSerials);
 
+    GetInteger(m_pRootNode, "cancelled_damage_for_vehicles", m_eventDamageCancelledSettings.triggerOnVehicleDamage);
+    GetInteger(m_pRootNode, "cancelled_damage_send_frame_based_dmg", m_eventDamageCancelledSettings.triggerForDamageCalledEveryFrame);
+
     ApplyNetOptions();
 
     return true;
@@ -1508,6 +1511,7 @@ const std::vector<SIntSetting>& CMainConfig::GetIntSettingList()
         {true, true, 50, 100, 4000, "keysync_mouse_sync_interval", &g_TickRateSettings.iKeySyncRotation, &CMainConfig::OnTickRateChange},
         {true, true, 50, 100, 4000, "keysync_analog_sync_interval", &g_TickRateSettings.iKeySyncAnalogMove, &CMainConfig::OnTickRateChange},
         {true, true, 50, 100, 4000, "donkey_work_interval", &g_TickRateSettings.iNearListUpdate, &CMainConfig::OnTickRateChange},
+        {true, true, 50, 1000, 4000, "cancelled_damage_send_interval", &g_TickRateSettings.cancelledDamageInterval, &CMainConfig::OnTickRateChange},
         {true, true, 0, 0, 1, "bullet_sync", &m_bBulletSyncEnabled, &CMainConfig::OnTickRateChange},
         {true, true, 0, 0, 120, "vehext_percent", &m_iVehExtrapolatePercent, &CMainConfig::OnTickRateChange},
         {true, true, 0, 150, 500, "vehext_ping_limit", &m_iVehExtrapolatePingLimit, &CMainConfig::OnTickRateChange},
@@ -1531,6 +1535,8 @@ const std::vector<SIntSetting>& CMainConfig::GetIntSettingList()
         {true, true, 50, 1000, 5000, "player_triggered_event_interval", &m_iPlayerTriggeredEventIntervalMs, &CMainConfig::OnPlayerTriggeredEventIntervalChange},
         {true, true, 1, 100, 1000, "max_player_triggered_events_per_interval", &m_iMaxPlayerTriggeredEventsPerInterval, &CMainConfig::OnPlayerTriggeredEventIntervalChange},
         {true, true, 0, 1, 1, "resource_client_file_checks", &m_checkResourceClientFiles, nullptr},
+        {true, true, 0, 0, 1, "cancelled_damage_for_vehicles", &m_eventDamageCancelledSettings.triggerOnVehicleDamage, &CMainConfig::OnSettingChange},
+        {true, true, 0, 1, 1, "cancelled_damage_send_frame_based_dmg", &m_eventDamageCancelledSettings.triggerForDamageCalledEveryFrame, &CMainConfig::OnSettingChange},
     };
 
     static std::vector<SIntSetting> settingsList;
@@ -1580,6 +1586,11 @@ void CMainConfig::OnPlayerTriggeredEventIntervalChange()
     g_pGame->ApplyPlayerTriggeredEventIntervalChange();
 }
 
+void CMainConfig::OnSettingChange()
+{
+    g_pGame->SendSyncSettings();
+}
+
 void CGame::ApplyPlayerTriggeredEventIntervalChange()
 {
     m_iClientTriggeredEventsIntervalMs = m_pMainConfig->GetPlayerTriggeredEventInterval();
diff --git a/Server/mods/deathmatch/logic/CMainConfig.h b/Server/mods/deathmatch/logic/CMainConfig.h
diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
diff --git a/Server/mods/deathmatch/logic/packets/CSyncSettingsPacket.cpp b/Server/mods/deathmatch/logic/packets/CSyncSettingsPacket.cpp
diff --git a/Server/mods/deathmatch/logic/packets/CSyncSettingsPacket.h b/Server/mods/deathmatch/logic/packets/CSyncSettingsPacket.h
diff --git a/Shared/mods/deathmatch/logic/CTickRateSettings.h b/Shared/mods/deathmatch/logic/CTickRateSettings.h

Original file line number	Diff line number	Diff line change
`@@ -603,6 +603,7 @@ void CWorldRPCs::SetSyncIntervals(NetBitStreamInterface& bitStream)`
`603`	`603`	`bitStream.Read(g_TickRateSettings.iKeySyncAnalogMove);`
`604`	`604`	`bitStream.Read(g_TickRateSettings.iPedSyncerDistance);`
`605`	`605`	`bitStream.Read(g_TickRateSettings.iUnoccupiedVehicleSyncerDistance);`
	`606`	`+ bitStream.Read(g_TickRateSettings.cancelledDamageInterval);`
`606`	`607`	`}`
`607`	`608`
`608`	`609`	`void CWorldRPCs::SetMoonSize(NetBitStreamInterface& bitStream)`