From 3d4e07fb8edeef5c1b99e79bbb0babb0272d0557 Mon Sep 17 00:00:00 2001 From: Gellipapa Date: Thu, 22 Jun 2023 23:27:46 +0200 Subject: [PATCH 1/3] :adhesive_bandage: fix get current resource name --- [core]/es_extended/locale.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/[core]/es_extended/locale.lua b/[core]/es_extended/locale.lua index 18120067..37c7e091 100644 --- a/[core]/es_extended/locale.lua +++ b/[core]/es_extended/locale.lua @@ -2,8 +2,7 @@ Locales = {} function Translate(str, ...) -- Translate string if not str then - local currentResourceName = GetCurrentResourceName() - print(("[^1ERROR^7] Resource ^5%s^7 You did not specify a parameter for the Translate function or the value is nil!"):format(currentResourceName)) + print(("[^1ERROR^7] Resource ^5%s^7 You did not specify a parameter for the Translate function or the value is nil!"):format(GetInvokingResource() or GetCurrentResourceName())) return 'Given translate function parameter is nil!' end if Locales[Config.Locale] then From ef013312014efbd5209197636e155d582382b303 Mon Sep 17 00:00:00 2001 From: Gellipapa Date: Thu, 22 Jun 2023 23:30:34 +0200 Subject: [PATCH 2/3] :adhesive_bandage: fix menu stuck --- [core]/esx_menu_default/client/main.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/[core]/esx_menu_default/client/main.lua b/[core]/esx_menu_default/client/main.lua index 65d62d09..81a2f45f 100644 --- a/[core]/esx_menu_default/client/main.lua +++ b/[core]/esx_menu_default/client/main.lua @@ -15,6 +15,9 @@ end local function closeMenu(namespace, name) CurrentNameSpace = namespace OpenedMenus -= 1 + if OpenedMenus < 0 then + OpenedMenus = 0 + end SendNUIMessage({ action = 'closeMenu', namespace = namespace, From 04c287330a68a6d42244d8b0fe89d9c9f4280e7f Mon Sep 17 00:00:00 2001 From: Gellipapa Date: Thu, 22 Jun 2023 23:37:41 +0200 Subject: [PATCH 3/3] :pencil2: fix typo --- [core]/es_extended/server/functions.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua index 1d290795..b1b16e56 100644 --- a/[core]/es_extended/server/functions.lua +++ b/[core]/es_extended/server/functions.lua @@ -378,7 +378,7 @@ function ESX.SetPlayerFunctionOverride(index) return print('[^3WARNING^7] No valid index provided.') end - Core.PlayerFunctionOverride = index + Config.PlayerFunctionOverride = index end function ESX.GetItemLabel(item)