valve/source-sdk-2013
0
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2025-04-08 19:12:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge a2dd2943bf into 0565403b15

Browse source
This commit is contained in:
speedvoltage 2025-04-04 18:57:48 +03:00 committed by GitHub
commit 2210ad40e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/server/basecombatcharacter.cpp
View file

@ -1139,6 +1139,9 @@ bool CTraceFilterMelee::ShouldHitEntity( IHandleEntity *pHandleEntity, int conte
if ( pEntity->m_takedamage == DAMAGE_NO )
return false;
if ( m_pPassEnt && !pEntity->CanBeHitByMeleeAttack( const_cast< CBaseEntity * >( EntityFromEntityHandle( m_pPassEnt ) ) ) )
return false;
// FIXME: Do not translate this to the driver because the driver only accepts damage from the vehicle
// Translate the vehicle into its driver for damage
/*
@ -1182,7 +1185,8 @@ bool CTraceFilterMelee::ShouldHitEntity( IHandleEntity *pHandleEntity, int conte
}
else
{
m_pHit = pEntity;
if ( !m_pHit )
m_pHit = pEntity;
// Make sure if the player is holding this, he drops it
Pickup_ForcePlayerToDropThisObject( pEntity );