From 3ca8e7ff76b155ea3fce9ca9f22fab8ed181c5cc Mon Sep 17 00:00:00 2001 From: darknight2590 <87971656+darknight2590@users.noreply.github.com> Date: Sat, 1 Jan 2022 20:24:39 +0200 Subject: [PATCH 1/4] make IsWearingHandshoes in core --- client/functions.lua | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/client/functions.lua b/client/functions.lua index 28b693b..11e705b 100644 --- a/client/functions.lua +++ b/client/functions.lua @@ -236,6 +236,22 @@ function QBCore.Functions.GetClosestPed(coords, ignoreList) return closestPed, closestDistance end +function QBCore.Functions.IsWearingGloves() + local armIndex = GetPedDrawableVariation(PlayerPedId(), 3) + local model = GetEntityModel(PlayerPedId()) + local retval = true + if model == `mp_m_freemode_01` then + if QBCore.Shared.MaleNoHandshoes[armIndex] ~= nil and QBCore.Shared.MaleNoHandshoes[armIndex] then + retval = false + end + else + if QBCore.Shared.FemaleNoHandshoes[armIndex] ~= nil and QBCore.Shared.FemaleNoHandshoes[armIndex] then + retval = false + end + end + return retval +end + function QBCore.Functions.GetClosestPlayer(coords) local ped = PlayerPedId() if coords then From 226906fd6bfe326d5ced7c0b779be0ab065fb752 Mon Sep 17 00:00:00 2001 From: darknight2590 <87971656+darknight2590@users.noreply.github.com> Date: Sat, 1 Jan 2022 20:25:50 +0200 Subject: [PATCH 2/4] Update main.lua --- shared/main.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/shared/main.lua b/shared/main.lua index 5b289a4..b95d744 100644 --- a/shared/main.lua +++ b/shared/main.lua @@ -74,4 +74,12 @@ QBShared.StarterItems = { ['phone'] = { amount = 1, item = 'phone' }, ['id_card'] = { amount = 1, item = 'id_card' }, ['driver_license'] = { amount = 1, item = 'driver_license' }, -} \ No newline at end of file +} + +QBShared.MaleNoHandshoes = { + [0] = true, [1] = true, [2] = true, [3] = true, [4] = true, [5] = true, [6] = true, [7] = true, [8] = true, [9] = true, [10] = true, [11] = true, [12] = true, [13] = true, [14] = true, [15] = true, [18] = true, [26] = true, [52] = true, [53] = true, [54] = true, [55] = true, [56] = true, [57] = true, [58] = true, [59] = true, [60] = true, [61] = true, [62] = true, [112] = true, [113] = true, [114] = true, [118] = true, [125] = true, [132] = true +} + +QBShared.FemaleNoHandshoes = { + [0] = true, [1] = true, [2] = true, [3] = true, [4] = true, [5] = true, [6] = true, [7] = true, [8] = true, [9] = true, [10] = true, [11] = true, [12] = true, [13] = true, [14] = true, [15] = true, [19] = true, [59] = true, [60] = true, [61] = true, [62] = true, [63] = true, [64] = true, [65] = true, [66] = true, [67] = true, [68] = true, [69] = true, [70] = true, [71] = true, [129] = true, [130] = true, [131] = true, [135] = true, [142] = true, [149] = true, [153] = true, [157] = true, [161] = true, [165] = true +} From bf1fafb19291c4d14eefa5b2cb3d6916e473febb Mon Sep 17 00:00:00 2001 From: darknight2590 <87971656+darknight2590@users.noreply.github.com> Date: Mon, 3 Jan 2022 09:09:24 +0200 Subject: [PATCH 3/4] fix rename --- client/functions.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/functions.lua b/client/functions.lua index 11e705b..de9a076 100644 --- a/client/functions.lua +++ b/client/functions.lua @@ -241,11 +241,11 @@ function QBCore.Functions.IsWearingGloves() local model = GetEntityModel(PlayerPedId()) local retval = true if model == `mp_m_freemode_01` then - if QBCore.Shared.MaleNoHandshoes[armIndex] ~= nil and QBCore.Shared.MaleNoHandshoes[armIndex] then + if QBCore.Shared.MaleNoGloves[armIndex] ~= nil and QBCore.Shared.MaleNoGloves[armIndex] then retval = false end else - if QBCore.Shared.FemaleNoHandshoes[armIndex] ~= nil and QBCore.Shared.FemaleNoHandshoes[armIndex] then + if QBCore.Shared.FemaleNoGloves[armIndex] ~= nil and QBCore.Shared.FemaleNoGloves[armIndex] then retval = false end end From deae13cb797f10ef4eea8a9df05ee8dcf9292682 Mon Sep 17 00:00:00 2001 From: darknight2590 <87971656+darknight2590@users.noreply.github.com> Date: Mon, 3 Jan 2022 09:10:06 +0200 Subject: [PATCH 4/4] fix name --- shared/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/main.lua b/shared/main.lua index b95d744..082a287 100644 --- a/shared/main.lua +++ b/shared/main.lua @@ -76,10 +76,10 @@ QBShared.StarterItems = { ['driver_license'] = { amount = 1, item = 'driver_license' }, } -QBShared.MaleNoHandshoes = { +QBShared.MaleNoGloves = { [0] = true, [1] = true, [2] = true, [3] = true, [4] = true, [5] = true, [6] = true, [7] = true, [8] = true, [9] = true, [10] = true, [11] = true, [12] = true, [13] = true, [14] = true, [15] = true, [18] = true, [26] = true, [52] = true, [53] = true, [54] = true, [55] = true, [56] = true, [57] = true, [58] = true, [59] = true, [60] = true, [61] = true, [62] = true, [112] = true, [113] = true, [114] = true, [118] = true, [125] = true, [132] = true } -QBShared.FemaleNoHandshoes = { +QBShared.FemaleNoGloves = { [0] = true, [1] = true, [2] = true, [3] = true, [4] = true, [5] = true, [6] = true, [7] = true, [8] = true, [9] = true, [10] = true, [11] = true, [12] = true, [13] = true, [14] = true, [15] = true, [19] = true, [59] = true, [60] = true, [61] = true, [62] = true, [63] = true, [64] = true, [65] = true, [66] = true, [67] = true, [68] = true, [69] = true, [70] = true, [71] = true, [129] = true, [130] = true, [131] = true, [135] = true, [142] = true, [149] = true, [153] = true, [157] = true, [161] = true, [165] = true }