Merge branch 'master' of https://git.evolution-state-life.de/Evolution-State-Life/Main

resources/[jobs]/[medic]/mh_Teddy/client/client.lua

@@ -15,13 +15,13 @@ CreateThread(function()
             --show3DText(pos, "[E] Hilfe anfordern")
             DrawText3D(pos.x, pos.y, pos.z, "[E] Hilfe anfordern")
             if IsControlJustPressed(0, 38) then
-                local doc = IsAnyMedicOnDuty()
+                QBCore.Functions.TriggerCallback('drteddy:ceckJob', function(cb)
-                Wait(100)
+                    if cb then
-                if doc then
                         TriggerServerEvent("drteddy:requestDoctor")
                     else
                         Notify("Dr. Teddy", "Dr. Teddy ist grade nicht im Dienst, ruf den Notdienst", "inform")
                     end
+                end)
             end
         end
     end

resources/[jobs]/[medic]/mh_Teddy/client/function.lua

@@ -87,13 +87,3 @@ function HealPlayerWithARE(ped)
     ClearTimecycleModifier()
     ClearExtraTimecycleModifier()
 end
-
-function IsAnyMedicOnDuty()
-    local players = QBCore.Functions.GetQBPlayers()
-    for _, player in pairs(players) do
-        if player.PlayerData.job.name == 'ambulance' and player.PlayerData.job.onduty then
-            return true
-        end
-    end
-    return false
-end

resources/[jobs]/[medic]/mh_Teddy/server/server.lua

@@ -43,3 +43,13 @@ QBCore.Functions.CreateCallback("drteddy:checkMoney", function(source, cb)
         cb({status = false, type = 'noPlayer'})
     end
 end)
+
+QBCore.Functions.CreateCallback('drteddy:ceckJob', function(source, cb)
+    local Players, Amount = QBCore.Functions.GetPlayersOnDuty('ambulance')
+
+    if Amount > 0 then
+        cb(true)
+    else
+        cb(false)
+    end
+end)