Skip to content

Fix #472 setElementHealth in onClientPedDamage can cause crash #3841

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

Closed
wants to merge 1 commit into from
Closed

Fix #472 setElementHealth in onClientPedDamage can cause crash #3841

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions Client/mods/deathmatch/logic/CClientGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4394,12 +4394,10 @@ bool CClientGame::ApplyPedDamageFromGame(eWeaponType weaponUsed, float fDamage,
return false;
}

if (pDamagedPed->IsLocalPlayer())
Copy link
Member

@TheNormalnij TheNormalnij Nov 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't this check added to avoid possible desync issues?

Copy link
Member Author

@FileEX FileEX Nov 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so, since HP will be synchronized when using setElementHealth in onClientPedDamage

Copy link
Member

@TheNormalnij TheNormalnij Nov 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HP is synchronized, but a remote player can die locally. It can cause nasty issues potentially

{
// Reget values in case they have been changed during onClientPlayerDamage event (Avoid AC#1 kick)
fCurrentHealth = pDamagedPed->GetGamePlayer()->GetHealth();
fCurrentArmor = pDamagedPed->GetGamePlayer()->GetArmor();
}
// Reget values in case they have been changed during onClientPlayerDamage event (Avoid AC#1 kick)
// (FileEX): We need to refresh the health value here because it may have been changed in the onClientPedDamage/onClientPlayerDamage event
fCurrentHealth = pDamagedPed->GetGamePlayer()->GetHealth();
fCurrentArmor = pDamagedPed->GetGamePlayer()->GetArmor();

bool bIsBeingShotWhilstAiming = (weaponUsed >= WEAPONTYPE_PISTOL && weaponUsed <= WEAPONTYPE_MINIGUN && pDamagedPed->IsUsingGun());
bool bOldBehaviour = !IsGlitchEnabled(GLITCH_HITANIM);
Expand Down
Loading