From fe0ce7b4718273bd680ad8ffa9f1a00e8e126b8c Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Sun, 19 May 2024 18:48:07 +0200 Subject: [PATCH 1/2] fix: .github\labeler.yml --- .github/labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 461356907..a8a1bd725 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -6,7 +6,7 @@ # https://github.com/actions/labeler name: Labeler -on: [pull_request_target] +on: [pull_request] jobs: label: From d587f8f4f48b1cce53ae7aeb51ac75fa0af95ce6 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Sun, 19 May 2024 18:49:04 +0200 Subject: [PATCH 2/2] fix: use bpt_idcard instead of jsfour-idcard --- .../[esx_addons]/BasicItem/client/main.lua | 13 ++++++------- .../resources/[esx_addons]/BasicItem/fxmanifest.lua | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/server-data/resources/[esx_addons]/BasicItem/client/main.lua b/server-data/resources/[esx_addons]/BasicItem/client/main.lua index fc75c580f..8b188f587 100644 --- a/server-data/resources/[esx_addons]/BasicItem/client/main.lua +++ b/server-data/resources/[esx_addons]/BasicItem/client/main.lua @@ -7,10 +7,10 @@ AddEventHandler("IDCARD:USE", function() closestPlayer, closestDistance = ESX.Game.GetClosestPlayer() if closestDistance ~= -1 and closestDistance <= 2.0 then ESX.ShowNotification((_LConfig.playerReceiveCard):format(GetPlayerName(closestPlayer))) - TriggerServerEvent("jsfour-idcard:open", GetPlayerServerId(PlayerId()), GetPlayerServerId(closestPlayer)) + TriggerServerEvent("bpt_idcard:open", GetPlayerServerId(PlayerId()), GetPlayerServerId(closestPlayer)) else ESX.ShowNotification(_LConfig.nobodyFound) - TriggerServerEvent("jsfour-idcard:open", GetPlayerServerId(PlayerId()), GetPlayerServerId(PlayerId())) + TriggerServerEvent("bpt_idcard:open", GetPlayerServerId(PlayerId()), GetPlayerServerId(PlayerId())) end Wait(1) end) @@ -20,10 +20,10 @@ AddEventHandler("DMVCARD:USE", function() closestPlayer, closestDistance = ESX.Game.GetClosestPlayer() if closestDistance ~= -1 and closestDistance <= 2.0 then ESX.ShowNotification((playerReceiveCard):format(GetPlayerName(closestPlayer))) - TriggerServerEvent("jsfour-idcard:open", GetPlayerServerId(PlayerId()), GetPlayerServerId(closestPlayer), "driver") + TriggerServerEvent("bpt_idcard:open", GetPlayerServerId(PlayerId()), GetPlayerServerId(closestPlayer), "driver") else ESX.ShowNotification(_LConfig.nobodyFound) - TriggerServerEvent("jsfour-idcard:open", GetPlayerServerId(PlayerId()), GetPlayerServerId(PlayerId()), "driver") + TriggerServerEvent("bpt_idcard:open", GetPlayerServerId(PlayerId()), GetPlayerServerId(PlayerId()), "driver") end Wait(1) end) @@ -33,10 +33,10 @@ AddEventHandler("WCARD:USE", function() closestPlayer, closestDistance = ESX.Game.GetClosestPlayer() if closestDistance ~= -1 and closestDistance <= 2.0 then ESX.ShowNotification((playerReceiveCard):format(GetPlayerName(closestPlayer))) - TriggerServerEvent("jsfour-idcard:open", GetPlayerServerId(PlayerId()), GetPlayerServerId(closestPlayer), "weapon") + TriggerServerEvent("bpt_idcardidcard:open", GetPlayerServerId(PlayerId()), GetPlayerServerId(closestPlayer), "weapon") else ESX.ShowNotification(_LConfig.nobodyFound) - TriggerServerEvent("jsfour-idcard:open", GetPlayerServerId(PlayerId()), GetPlayerServerId(PlayerId()), "weapon") + TriggerServerEvent("bpt_idcard:open", GetPlayerServerId(PlayerId()), GetPlayerServerId(PlayerId()), "weapon") end Wait(1) end) @@ -44,7 +44,6 @@ end) RegisterNetEvent("JOBCARD:USE") AddEventHandler("JOBCARD:USE", function(user) closestPlayer, closestDistance = ESX.Game.GetClosestPlayer() - ESX = exports["es_extended"]:getSharedObject() ESX.PlayerData = ESX.GetPlayerData() local userData = user[1] diff --git a/server-data/resources/[esx_addons]/BasicItem/fxmanifest.lua b/server-data/resources/[esx_addons]/BasicItem/fxmanifest.lua index d54d5914a..293f65414 100644 --- a/server-data/resources/[esx_addons]/BasicItem/fxmanifest.lua +++ b/server-data/resources/[esx_addons]/BasicItem/fxmanifest.lua @@ -29,4 +29,4 @@ server_scripts({ "config.lua", }) -dependency("jsfour-idcard") +dependency("bpt_idcard")