PR #383

qbcore-framework · Sep 30, 2023 · 8d53149 · 8d53149
1 parent e1d15b8
commit 8d53149
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/client/ignore.lua b/client/ignore.lua
@@ -120,11 +120,21 @@ CreateThread(function()
 end)
 
 CreateThread(function()
+    local ped = PlayerPedId()
     while Config.RemovePistolWhipping do
-        if IsPedArmed(PlayerPedId(), 6) then
-            DisableControlAction(1, 140, true)
-            DisableControlAction(1, 141, true)
-            DisableControlAction(1, 142, true)
+        local sleep = 1000
+        if LocalPlayer.state.isLoggedIn then
+            if GetSelectedPedWeapon(ped) ~= joaat(`WEAPON_UNARMED`) and not IsPedArmed(ped, 1) then
+                if not IsPedInAnyVehicle(ped, true) then
+                    DisableControlAction(0, 140, true)
+                    DisableControlAction(0, 141, true)
+                    DisableControlAction(0, 142, true)
+                else
+                    Wait(sleep)
+                end
+            end
+        else
+            Wait(sleep)
         end
         Wait(5)
     end