ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

chore: disabled blame explosion infraction (#1282)

Browse Source
This commit is contained in:
Andreas Maerten 2023-04-23 22:39:16 +02:00 committed by GitHub
parent 2206995a9c
commit 9bc99e18cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/hooks/protections/received_event.cpp
View File

@ -27,7 +27,7 @@ namespace big
void scan_weapon_damage_event(CNetGamePlayer* player, rage::datBitBuffer* buffer) void scan_weapon_damage_event(CNetGamePlayer* player, rage::datBitBuffer* buffer)
{ {
uint8_t damageType; uint8_t damageType;
uint32_t weaponType;// weaponHash uint32_t weaponType; // weaponHash
bool overrideDefaultDamage; bool overrideDefaultDamage;
bool hitEntityWeapon; bool hitEntityWeapon;
@ -55,8 +55,8 @@ namespace big
uint16_t f112_1; uint16_t f112_1;
uint16_t parentGlobalId;// Source entity? uint16_t parentGlobalId; // Source entity?
uint16_t hitGlobalId; // Target entity? uint16_t hitGlobalId; // Target entity?
uint8_t tyreIndex; uint8_t tyreIndex;
uint8_t suspensionIndex; uint8_t suspensionIndex;
@ -107,7 +107,7 @@ namespace big
if (isNetTargetPos) if (isNetTargetPos)
{ {
localPos.x = buffer->ReadSignedFloat(16, 55.f);// divisor: 0x425C0000 localPos.x = buffer->ReadSignedFloat(16, 55.f); // divisor: 0x425C0000
localPos.y = buffer->ReadSignedFloat(16, 55.f); localPos.y = buffer->ReadSignedFloat(16, 55.f);
localPos.z = buffer->ReadSignedFloat(16, 55.f); localPos.z = buffer->ReadSignedFloat(16, 55.f);
} }
@ -139,13 +139,13 @@ namespace big
} }
else else
{ {
parentGlobalId = buffer->Read<uint16_t>(13);// +118 parentGlobalId = buffer->Read<uint16_t>(13); // +118
hitGlobalId = buffer->Read<uint16_t>(13);// +120 hitGlobalId = buffer->Read<uint16_t>(13); // +120
} }
if (damageType < 2) if (damageType < 2)
{ {
localPos.x = buffer->ReadSignedFloat(16, 55.f);// divisor: 0x425C0000 localPos.x = buffer->ReadSignedFloat(16, 55.f); // divisor: 0x425C0000
localPos.y = buffer->ReadSignedFloat(16, 55.f); localPos.y = buffer->ReadSignedFloat(16, 55.f);
localPos.z = buffer->ReadSignedFloat(16, 55.f); localPos.z = buffer->ReadSignedFloat(16, 55.f);
@ -155,14 +155,14 @@ namespace big
if (hasVehicleData) if (hasVehicleData)
{ {
tyreIndex = buffer->Read<uint8_t>(4);// +122 tyreIndex = buffer->Read<uint8_t>(4); // +122
suspensionIndex = buffer->Read<uint8_t>(4);// +123 suspensionIndex = buffer->Read<uint8_t>(4); // +123
} }
} }
} }
else else
{ {
hitComponent = buffer->Read<uint8_t>(5);// +108 hitComponent = buffer->Read<uint8_t>(5); // +108
} }
f133 = buffer->Read<uint8_t>(1); f133 = buffer->Read<uint8_t>(1);
@ -170,7 +170,7 @@ namespace big
if (hasImpactDir) if (hasImpactDir)
{ {
impactDir.x = buffer->ReadSignedFloat(16, 6.2831854820251f);// divisor: 0x40C90FDB impactDir.x = buffer->ReadSignedFloat(16, 6.2831854820251f); // divisor: 0x40C90FDB
impactDir.y = buffer->ReadSignedFloat(16, 6.2831854820251f); impactDir.y = buffer->ReadSignedFloat(16, 6.2831854820251f);
impactDir.z = buffer->ReadSignedFloat(16, 6.2831854820251f); impactDir.z = buffer->ReadSignedFloat(16, 6.2831854820251f);
} }
@ -334,7 +334,8 @@ namespace big
std::vformat("BLAMED_FOR_EXPLOSION"_T, std::vformat("BLAMED_FOR_EXPLOSION"_T,
std::make_format_args(player->get_name(), std::make_format_args(player->get_name(),
reinterpret_cast<CPed*>(entity)->m_player_info->m_net_player_data.m_name))); reinterpret_cast<CPed*>(entity)->m_player_info->m_net_player_data.m_name)));
session::add_infraction(g_player_service->get_by_id(player->m_player_id), Infraction::BLAME_EXPLOSION_DETECTED); // too many false positives, disabling it
//session::add_infraction(g_player_service->get_by_id(player->m_player_id), Infraction::BLAME_EXPLOSION_DETECTED);
return; return;
} }
@ -511,19 +512,19 @@ namespace big
if (type == WorldStateDataType::Rope) if (type == WorldStateDataType::Rope)
{ {
buffer->Read<int>(9); // network rope id buffer->Read<int>(9); // network rope id
buffer->Read<float>(19);// pos x buffer->Read<float>(19); // pos x
buffer->Read<float>(19);// pos y buffer->Read<float>(19); // pos y
buffer->Read<float>(19);// pos z buffer->Read<float>(19); // pos z
buffer->Read<float>(19);// rot x buffer->Read<float>(19); // rot x
buffer->Read<float>(19);// rot y buffer->Read<float>(19); // rot y
buffer->Read<float>(19);// rot z buffer->Read<float>(19); // rot z
buffer->Read<float>(16);// length buffer->Read<float>(16); // length
int type = buffer->Read<int>(4); int type = buffer->Read<int>(4);
float initial_length = buffer->Read<float>(16); float initial_length = buffer->Read<float>(16);
float min_length = buffer->Read<float>(16); float min_length = buffer->Read<float>(16);
if (type == 0 || initial_length < min_length)// https://docs.fivem.net/natives/?_0xE832D760399EB220 if (type == 0 || initial_length < min_length) // https://docs.fivem.net/natives/?_0xE832D760399EB220
{ {
// most definitely a crash // most definitely a crash
LOG(INFO) << std::hex << std::uppercase << "0x" << id.m_hash; LOG(INFO) << std::hex << std::uppercase << "0x" << id.m_hash;
@ -534,9 +535,9 @@ namespace big
} }
else if (type == WorldStateDataType::PopGroupOverride) else if (type == WorldStateDataType::PopGroupOverride)
{ {
int pop_schedule = buffer->ReadSigned<int>(8);// Pop Schedule int pop_schedule = buffer->ReadSigned<int>(8); // Pop Schedule
int pop_group = buffer->Read<int>(32); // Pop Group int pop_group = buffer->Read<int>(32); // Pop Group
int percentage = buffer->Read<int>(7); // Percentage int percentage = buffer->Read<int>(7); // Percentage
if (pop_group == 0 && (percentage == 0 || percentage == 103)) if (pop_group == 0 && (percentage == 0 || percentage == 103))
{ {