From 53273d1b9562faaead4fe66d0f8ed5208194586b Mon Sep 17 00:00:00 2001 From: SMVampire Date: Sun, 18 Apr 2021 16:04:51 -0400 Subject: [PATCH 1/2] Pass currentZone to serverside --- client/main.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/main.lua b/client/main.lua index e3f9cf79..aeb0e162 100644 --- a/client/main.lua +++ b/client/main.lua @@ -84,7 +84,7 @@ function OpenMenu() end) end -AddEventHandler('esx_jobs:action', function(job, zone) +AddEventHandler('esx_jobs:action', function(job, zone, zoneKey) menuIsShowed = true if zone.Type == "cloakroom" then OpenMenu() @@ -96,7 +96,7 @@ AddEventHandler('esx_jobs:action', function(job, zone) if IsPedInAnyVehicle(playerPed, false) then ESX.ShowNotification(_U('foot_work')) else - TriggerServerEvent('esx_jobs:startWork', zone.Item) + TriggerServerEvent('esx_jobs:startWork', zone.Item, zoneKey) end elseif zone.Type == "vehspawner" then local spawnPoint = nil @@ -469,7 +469,7 @@ Citizen.CreateThread(function() if IsControlJustReleased(0, Keys['E']) and not menuIsShowed and isInMarker then if onDuty or zone.Type == "cloakroom" or PlayerData.job.name == "reporter" then - TriggerEvent('esx_jobs:action', job, zone) + TriggerEvent('esx_jobs:action', job, zone, currentZone) end end @@ -539,4 +539,4 @@ Citizen.CreateThread(function() -- Tailor RequestIpl("id2_14_during_door") RequestIpl("id2_14_during1") -end) \ No newline at end of file +end) From dba0c7302198ebae4447652c3ecf449a7041bfa5 Mon Sep 17 00:00:00 2001 From: SMVampire Date: Sun, 18 Apr 2021 16:07:03 -0400 Subject: [PATCH 2/2] Fix #L88 Key with zoneKey --- server/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index 2541f01c..18f465ef 100644 --- a/server/main.lua +++ b/server/main.lua @@ -77,7 +77,7 @@ Citizen.CreateThread(function() end) RegisterServerEvent('esx_jobs:startWork') -AddEventHandler('esx_jobs:startWork', function(zoneIndex) +AddEventHandler('esx_jobs:startWork', function(zoneIndex, zoneKey) if not playersWorking[source] then local xPlayer = ESX.GetPlayerFromId(source) @@ -85,7 +85,7 @@ AddEventHandler('esx_jobs:startWork', function(zoneIndex) local jobObject = Config.Jobs[xPlayer.job.name] if jobObject then - local jobZone = jobObject.Zones[zoneIndex] + local jobZone = jobObject.Zones[zoneKey] if jobZone and jobZone.Item then playersWorking[source] = {