From 6f31964bbc3cd2015912aae03c89a8f84f281f0f Mon Sep 17 00:00:00 2001 From: "zer0.k" Date: Thu, 9 Mar 2023 20:34:34 +0100 Subject: [PATCH] No longer ignore bots for movement function hooks --- .../sourcemod/scripting/movementapi/hooks.sp | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/addons/sourcemod/scripting/movementapi/hooks.sp b/addons/sourcemod/scripting/movementapi/hooks.sp index 73783bf..5b3d59c 100644 --- a/addons/sourcemod/scripting/movementapi/hooks.sp +++ b/addons/sourcemod/scripting/movementapi/hooks.sp @@ -64,7 +64,7 @@ Action UpdateMoveData(Address pThis, int client, Function func) public MRESReturn DHooks_OnDuck_Pre(Address pThis) { int client = GetClientFromGameMovementAddress(pThis); - if (!IsPlayerAlive(client) || IsFakeClient(client) || Movement_GetMovetype(client) == MOVETYPE_NOCLIP) + if (!IsPlayerAlive(client) || Movement_GetMovetype(client) == MOVETYPE_NOCLIP) { return MRES_Ignored; } @@ -86,7 +86,7 @@ public MRESReturn DHooks_OnDuck_Pre(Address pThis) public MRESReturn DHooks_OnDuck_Post(Address pThis) { int client = GetClientFromGameMovementAddress(pThis); - if (!IsPlayerAlive(client) || IsFakeClient(client) || Movement_GetMovetype(client) == MOVETYPE_NOCLIP) + if (!IsPlayerAlive(client) || Movement_GetMovetype(client) == MOVETYPE_NOCLIP) { return MRES_Ignored; } @@ -116,7 +116,7 @@ public MRESReturn DHooks_OnDuck_Post(Address pThis) public MRESReturn DHooks_OnLadderMove_Pre(Address pThis) { int client = GetClientFromGameMovementAddress(pThis); - if (!IsPlayerAlive(client) || IsFakeClient(client) || Movement_GetMovetype(client) == MOVETYPE_NOCLIP) + if (!IsPlayerAlive(client) || Movement_GetMovetype(client) == MOVETYPE_NOCLIP) { return MRES_Ignored; } @@ -140,7 +140,7 @@ public MRESReturn DHooks_OnLadderMove_Post(Address pThis, DHookReturn hReturn) // While the movetype changed here, the vertical velocity is not yet updated. // gF_PostLadderMoveVelocity can be incorrect here. int client = GetClientFromGameMovementAddress(pThis); - if (!IsPlayerAlive(client) || IsFakeClient(client) || Movement_GetMovetype(client) == MOVETYPE_NOCLIP) + if (!IsPlayerAlive(client) || Movement_GetMovetype(client) == MOVETYPE_NOCLIP) { return MRES_Ignored; } @@ -207,7 +207,7 @@ public MRESReturn DHooks_OnLadderMove_Post(Address pThis, DHookReturn hReturn) public MRESReturn DHooks_OnFullLadderMove_Pre(Address pThis) { int client = GetClientFromGameMovementAddress(pThis); - if (!IsPlayerAlive(client) || IsFakeClient(client)) + if (!IsPlayerAlive(client)) { return MRES_Ignored; } @@ -226,7 +226,7 @@ public MRESReturn DHooks_OnFullLadderMove_Pre(Address pThis) public MRESReturn DHooks_OnJump_Pre(Address pThis, DHookParam hParams) { int client = GetClientFromGameMovementAddress(pThis); - if (!IsPlayerAlive(client) || IsFakeClient(client)) + if (!IsPlayerAlive(client)) { return MRES_Ignored; } @@ -265,7 +265,7 @@ public MRESReturn DHooks_OnJump_Pre(Address pThis, DHookParam hParams) public MRESReturn DHooks_OnJump_Post(Address pThis, DHookParam hParams) { int client = GetClientFromGameMovementAddress(pThis); - if (!IsPlayerAlive(client) || IsFakeClient(client)) + if (!IsPlayerAlive(client)) { return MRES_Ignored; } @@ -295,7 +295,7 @@ public MRESReturn DHooks_OnJump_Post(Address pThis, DHookParam hParams) public MRESReturn DHooks_OnFullLadderMove_Post(Address pThis) { int client = GetClientFromGameMovementAddress(pThis); - if (!IsPlayerAlive(client) || IsFakeClient(client) || Movement_GetMovetype(client) == MOVETYPE_NOCLIP) + if (!IsPlayerAlive(client) || Movement_GetMovetype(client) == MOVETYPE_NOCLIP) { return MRES_Ignored; } @@ -315,7 +315,7 @@ public MRESReturn DHooks_OnFullLadderMove_Post(Address pThis) public MRESReturn DHooks_OnAirAccelerate_Pre(Address pThis, DHookParam hParams) { int client = GetClientFromGameMovementAddress(pThis); - if (!IsPlayerAlive(client) || IsFakeClient(client)) + if (!IsPlayerAlive(client)) { return MRES_Ignored; } @@ -334,7 +334,7 @@ public MRESReturn DHooks_OnAirAccelerate_Pre(Address pThis, DHookParam hParams) public MRESReturn DHooks_OnAirAccelerate_Post(Address pThis, DHookParam hParams) { int client = GetClientFromGameMovementAddress(pThis); - if (!IsPlayerAlive(client) || IsFakeClient(client)) + if (!IsPlayerAlive(client)) { return MRES_Ignored; } @@ -357,7 +357,7 @@ public MRESReturn DHooks_OnAirAccelerate_Post(Address pThis, DHookParam hParams) public MRESReturn DHooks_OnWalkMove_Pre(Address pThis) { int client = GetClientFromGameMovementAddress(pThis); - if (!IsPlayerAlive(client) || IsFakeClient(client)) + if (!IsPlayerAlive(client)) { return MRES_Ignored; } @@ -376,7 +376,7 @@ public MRESReturn DHooks_OnWalkMove_Pre(Address pThis) public MRESReturn DHooks_OnWalkMove_Post(Address pThis) { int client = GetClientFromGameMovementAddress(pThis); - if (!IsPlayerAlive(client) || IsFakeClient(client)) + if (!IsPlayerAlive(client)) { return MRES_Ignored; } @@ -398,7 +398,7 @@ public MRESReturn DHooks_OnWalkMove_Post(Address pThis) public MRESReturn DHooks_OnPlayerMove_Pre(Address pThis) { int client = GetClientFromGameMovementAddress(pThis); - if (!IsPlayerAlive(client) || IsFakeClient(client)) + if (!IsPlayerAlive(client)) { return MRES_Ignored; } @@ -424,7 +424,7 @@ public MRESReturn DHooks_OnPlayerMove_Pre(Address pThis) public MRESReturn DHooks_OnPlayerMove_Post(Address pThis) { int client = GetClientFromGameMovementAddress(pThis); - if (!IsPlayerAlive(client) || IsFakeClient(client)) + if (!IsPlayerAlive(client)) { return MRES_Ignored; } @@ -443,7 +443,7 @@ public MRESReturn DHooks_OnPlayerMove_Post(Address pThis) public MRESReturn DHooks_OnCategorizePosition_Pre(Address pThis) { int client = GetClientFromGameMovementAddress(pThis); - if (!IsPlayerAlive(client) || IsFakeClient(client)) + if (!IsPlayerAlive(client)) { return MRES_Ignored; } @@ -464,7 +464,7 @@ public MRESReturn DHooks_OnCategorizePosition_Pre(Address pThis) public MRESReturn DHooks_OnCategorizePosition_Post(Address pThis) { int client = GetClientFromGameMovementAddress(pThis); - if (!IsPlayerAlive(client) || IsFakeClient(client)) + if (!IsPlayerAlive(client)) { return MRES_Ignored; }