Skip to content

Fix stale PostAA data in nobug landing origin on teleport, ladder and water landings #66

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
jvnipers wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix stale PostAA data in nobug landing origin on teleport, ladder and water landings #66

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
6 changes: 5 additions & 1 deletion addons/sourcemod/scripting/movementapi/hooks.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ static bool gB_TraceHookAttempted;
static bool gB_TraceHookFired;
static Address moveHelperAddr;
static bool gB_TryPlayerMoveThisTick[MAXPLAYERS + 1];
static bool gB_AirAcceleratedThisTick[MAXPLAYERS + 1];

// trace_t offsets
#define TRACE_STARTPOS 0
Expand Down Expand Up @@ -388,6 +389,7 @@ public MRESReturn DHooks_OnAirAccelerate_Post(Address pThis, DHookParam hParams)

GameMove_GetOrigin(pThis, gF_PostAAOrigin[client]);
GameMove_GetVelocity(pThis, gF_PostAAVelocity[client]);
gB_AirAcceleratedThisTick[client] = true;

Action result = UpdateMoveData(pThis, client, Call_OnAirAcceleratePost);
if (result != Plugin_Continue)
Expand Down Expand Up @@ -456,6 +458,7 @@ public MRESReturn DHooks_OnPlayerMove_Pre(Address pThis)
gB_Jumped[client] = false;
gB_TakeoffFromLadder[client] = false;
gB_TryPlayerMoveThisTick[client] = false;
gB_AirAcceleratedThisTick[client] = false;
gI_CollisionCount[client] = 0;
gB_PendingEdgebug[client] = false;

Expand Down Expand Up @@ -883,7 +886,8 @@ static void NobugLandingOrigin(int client, float landingOrigin[3])

// It seems like sometimes the player can end up ever so slighly above this "ground" value,
// likely due to floating point precision error. Treat it as a bugged jump as well.
if (distanceToGround > 0.001 || gB_ProcessingDuck[client])
// PostAA is stale when a landing comes before or without AirMove (teleport, ladder, water).
if (distanceToGround > 0.001 || gB_ProcessingDuck[client] || !gB_AirAcceleratedThisTick[client])
{
// Use the current origin and velocity if we're not touching the ground
gF_LandingVelocity[client] = gF_Velocity[client];
Expand Down