Skip to content

Restrictions in the functions setElementPosition, blowVehicle, and setElementHealth on the client side #4376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Restrictions in the functions setElementPosition, blowVehicle, and setElementHealth on the client side #4376

Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
08fc24a
The end of synchronization for blowVehicle and a few other functions
FileEX Aug 20, 2025
b997f8c
Merge branch 'master' into refactor/synced_functions
Dutchman101 Aug 20, 2025
f4cdc45
Changes
FileEX Aug 21, 2025
624dac1
Merge branch 'refactor/synced_functions' of https://github.com/FileEX…
FileEX Aug 21, 2025
a33bb91
Merge branch 'master' into refactor/synced_functions
FileEX Aug 21, 2025
3a75606
Update CStaticFunctionDefinitions.cpp
FileEX Aug 21, 2025
443d745
Review
FileEX Aug 21, 2025
9f29b2a
Update CStaticFunctionDefinitions.cpp
FileEX Aug 21, 2025
58484be
Changes
FileEX Aug 24, 2025
6b121ad
Merge branch 'master' into refactor/synced_functions
Dutchman101 Oct 9, 2025
83635b8
setPedArmor & warnings
FileEX Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 15 additions & 33 deletions Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,6 +1076,13 @@ bool CStaticFunctionDefinitions::SetElementPosition(CClientEntity& Entity, const
{
RUN_CHILDREN(SetElementPosition(**iter, vecPosition))

if (Entity.GetType() == CCLIENTVEHICLE)
{
CClientPed* driver = static_cast<CClientVehicle&>(Entity).GetOccupant(0);
if (!Entity.IsLocalEntity() && !static_cast<CDeathmatchVehicle&>(Entity).IsSyncing() && (driver && !driver->IsLocalPlayer()))
return false;
}

if (bWarp)
Entity.Teleport(vecPosition);
else
Expand Down Expand Up @@ -1491,6 +1498,9 @@ bool CStaticFunctionDefinitions::SetElementHealth(CClientEntity& Entity, float f
{
RUN_CHILDREN(SetElementHealth(**iter, fHealth))

if (!Entity.IsLocalEntity())
return false;

switch (Entity.GetType())
{
case CCLIENTPED:
Expand Down Expand Up @@ -2907,41 +2917,13 @@ bool CStaticFunctionDefinitions::BlowVehicle(CClientEntity& Entity, std::optiona
return false;

CClientVehicle& vehicle = static_cast<CClientVehicle&>(Entity);
VehicleBlowFlags blow;
if (!vehicle.IsLocalEntity())
return false;

VehicleBlowFlags blow;

blow.withExplosion = withExplosion.value_or(true);

if (vehicle.IsLocalEntity())
{
vehicle.Blow(blow);
}
else
{
CVector position;
vehicle.GetPosition(position);

const auto type = vehicle.GetType();
const auto state = (blow.withExplosion ? VehicleBlowState::AWAITING_EXPLOSION_SYNC : VehicleBlowState::BLOWN);
eExplosionType explosion;

switch (type)
{
case CLIENTVEHICLE_CAR:
explosion = EXP_TYPE_CAR;
break;
case CLIENTVEHICLE_HELI:
explosion = EXP_TYPE_HELI;
break;
case CLIENTVEHICLE_BOAT:
explosion = EXP_TYPE_BOAT;
break;
default:
explosion = EXP_TYPE_CAR;
}

g_pClientGame->SendExplosionSync(position, explosion, &Entity, state);
}

vehicle.Blow(blow);
return true;
}

Expand Down
Loading