Skip to content

Fix players being able to warp through walls when touching some physics objects #2139

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
DESTROYGIRL wants to merge 1 commit into
base: master
Choose a base branch
from
+41 −0
Open

Fix players being able to warp through walls when touching some physics objects #2139

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
41 changes: 41 additions & 0 deletions src/game/server/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ static ConVar sv_maxusrcmdprocessticks( "sv_maxusrcmdprocessticks", "24", FCVAR_
static ConVar old_armor( "player_old_armor", "0" );

static ConVar physicsshadowupdate_render( "physicsshadowupdate_render", "0" );
#ifdef NEO
static ConVar sv_neo_block_physics_warp( "sv_neo_block_physics_warp", "1", FCVAR_NONE, "Attempt to prevent players from being teleported through walls by some physics objects" );
#endif
bool IsInCommentaryMode( void );
bool IsListeningToCommentary( void );

Expand Down Expand Up @@ -8756,6 +8759,41 @@ void CBasePlayer::VPhysicsShadowUpdate( IPhysicsObject *pPhysics )
{
if ( m_touchedPhysObject || pPhysGround )
{
#ifdef NEO
// Attempt to fix warping through walls.
// Rather than trusting whatever vphysics says, lets check if the
// player could have actually launched that far with that velocity
bool bBlockedWarp = false;
if ( sv_neo_block_physics_warp.GetBool() )
{
float flPhysDelta = TICK_INTERVAL * phys_timescale.GetFloat();
if ( flPhysDelta <= 0.0f )
{
flPhysDelta = TICK_INTERVAL;
}

const Vector vecWarp = newPosition - GetAbsOrigin();
const float flWarpDist = vecWarp.Length();
const float flValidSpeed = Max( newVelocity.Length(), GetAbsVelocity().Length() );

const float flMaxValidDist = ( flValidSpeed * flPhysDelta * 4.0f /* vphys leeway */ ) + 32.0f /* Dist tolerance gap before it looks sus */;
if ( flWarpDist > flMaxValidDist )
{
bBlockedWarp = true;

DevMsg( "VPhysicsShadowUpdate: Prevented warp for \"%s\" (Would've moved %.1f units, but only <%.1f was acceptable)\n", GetPlayerName(), flWarpDist, flMaxValidDist );

pPhysics->SetPosition( GetAbsOrigin(), vec3_angle, true );
const Vector vel = GetAbsVelocity();
pPhysics->SetVelocity( &vel, NULL );
UpdateVPhysicsPosition( GetAbsOrigin(), vel, 0.0f );
lastValidPosition = GetAbsOrigin();
}
}

if ( !bBlockedWarp )
{
#endif
// BUGBUG: Rewrite this code using fixed timestep
if ( deltaV >= maxVelErrorSqr && !m_bPhysicsWasFrozen )
{
Expand Down Expand Up @@ -8795,6 +8833,9 @@ void CBasePlayer::VPhysicsShadowUpdate( IPhysicsObject *pPhysics )
{
SetAbsOrigin( newPosition );
}
#ifdef NEO
}
#endif
}
else
{
Expand Down