From c08bade4920c63d47e630679af3c2f5edffe10df Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Sun, 9 Jan 2022 05:29:24 -0600 Subject: [PATCH] Use new force player anim util for tazer --- scripts/server/item/tazer.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/scripts/server/item/tazer.js b/scripts/server/item/tazer.js index 799b9501..f4fa16d5 100644 --- a/scripts/server/item/tazer.js +++ b/scripts/server/item/tazer.js @@ -21,19 +21,12 @@ function tazePlayer(client) { let animationId = getAnimationFromParams("tazed"); if(animationId != false) { - forcePedAnimation(client.player, animationId); - - getPlayerData(client).currentAnimation = animationId; - getPlayerData(client).currentAnimationPositionOffset = toVector3(0.0, 0.0, 0.0); - getPlayerData(client).currentAnimationPositionReturnTo = getPlayerPosition(client); - getPlayerData(client).animationStart = getCurrentUnixTimestamp(); - getPlayerData(client).animationForced = true; + forcePlayerPlayAnimation(client, animationId); } setTimeout(function() { unTazePlayer(client); doActionToNearbyPlayers(client, `The tazer effect wears off`); - }, getGlobalConfig().tazerEffectDuration); } @@ -45,8 +38,7 @@ function unTazePlayer(client) { setPlayerControlState(client, true); setPlayerPosition(client, getPlayerData(client).currentAnimationPositionReturnTo); makePedStopAnimation(getPlayerData(client).ped); - setPlayerMouseCameraState(client, false); - getPlayerData(client).forcedPedAnimation = -1; + } // =========================================================================== \ No newline at end of file