Skip to content

trigger_serverragdoll applies to players #1141

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

Merged
DESTROYGIRL merged 1 commit into from
May 15, 2025
Merged

trigger_serverragdoll applies to players #1141

Show file tree
Hide file tree
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
7 changes: 5 additions & 2 deletions src/game/server/neo/neo_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1942,7 +1942,10 @@ void CNEO_Player::AddPoints(int score, bool bAllowNegativeScore)

void CNEO_Player::Event_Killed( const CTakeDamageInfo &info )
{
CreateRagdollEntity();
if (!m_bForceServerRagdoll)
{
CreateRagdollEntity();
}

// Calculate force for weapon drop
Vector forceVector = CalcDamageForceVector(info);
Expand Down Expand Up @@ -2049,7 +2052,7 @@ void CNEO_Player::SetDeadModel(const CTakeDamageInfo& info)

int deadModelType = -1;

if (!m_bAllowGibbing) // Prevent gibbing if a custom player model has been set via I/O
if (!m_bAllowGibbing || m_bForceServerRagdoll) // Prevent gibbing if a custom player model has been set via I/O or the ragdoll is serverside
{
return;
}
Expand Down
8 changes: 4 additions & 4 deletions src/game/server/triggers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4875,10 +4875,10 @@ void CServerRagdollTrigger::Spawn( void )
void CServerRagdollTrigger::StartTouch(CBaseEntity *pOther)
{
BaseClass::StartTouch( pOther );

#ifndef NEO
if ( pOther->IsPlayer() )
return;

#endif
CBaseCombatCharacter *pCombatChar = pOther->MyCombatCharacterPointer();

if ( pCombatChar )
Expand All @@ -4890,10 +4890,10 @@ void CServerRagdollTrigger::StartTouch(CBaseEntity *pOther)
void CServerRagdollTrigger::EndTouch(CBaseEntity *pOther)
{
BaseClass::EndTouch( pOther );

#ifndef NEO
if ( pOther->IsPlayer() )
return;

#endif
CBaseCombatCharacter *pCombatChar = pOther->MyCombatCharacterPointer();

if ( pCombatChar )
Expand Down