From d6fd2cc28c68d553e7f64ed741aab72edb95faf2 Mon Sep 17 00:00:00 2001
From: Jim Shield <gothicjim@gmail.com>
Date: Mon, 7 Jul 2025 00:09:34 +0100
Subject: [PATCH] Fix toggleDuty() for ESX

---
 shared/_loaders.lua     |  1 -
 shared/jobfunctions.lua | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/shared/_loaders.lua b/shared/_loaders.lua
index ae23801..1ca9988 100644
--- a/shared/_loaders.lua
+++ b/shared/_loaders.lua
@@ -117,7 +117,6 @@ function onResourceStart(func, thisScript)
                     debugPrint("^6Bridge^7: ^2Shared Load Detected^7.")
                     hasPrinted = true
                 end
-                if isStarted(ESXExport) then Wait(10000) end
                 func()
             end
         end
diff --git a/shared/jobfunctions.lua b/shared/jobfunctions.lua
index 70f52b2..7dff529 100644
--- a/shared/jobfunctions.lua
+++ b/shared/jobfunctions.lua
@@ -104,16 +104,31 @@ function toggleDuty()
         TriggerServerEvent("QBCore:ToggleDuty")
         Wait(100)
         onDuty = getPlayer().onDuty
+
     elseif isStarted(RSGExport) then
         TriggerServerEvent("RSGCore:ToggleDuty")
         Wait(100)
         onDuty = getPlayer().onDuty
-    else
+
+    elseif isStarted(ESXExport) then
+        local tempJob = ESX.GetPlayerData().job
+        tempJob.onDuty = not onDuty
+        ESX.SetPlayerData("job", tempJob)
+        onDuty = getPlayer().onDuty
         if onDuty then
             triggerNotify(nil, "Now on duty", "success")
         else
             triggerNotify(nil, "Now off duty", "success")
         end
+
+    else
+        onDuty = not onDuty
+        if onDuty then
+            triggerNotify(nil, "Now on duty", "success")
+        else
+            triggerNotify(nil, "Now off duty", "success")
+        end
+
     end
 end