diff --git a/[core]/es_extended/imports.lua b/[core]/es_extended/imports.lua index a81a71ef..ffb7d4bf 100644 --- a/[core]/es_extended/imports.lua +++ b/[core]/es_extended/imports.lua @@ -1,5 +1,7 @@ ESX = exports["es_extended"]:getSharedObject() +OnPlayerData = function (key, val, last) end + if not IsDuplicityVersion() then -- Only register this event for the client AddEventHandler("esx:setPlayerData", function(key, val, last) if GetInvokingResource() == "es_extended" then diff --git a/[core]/es_extended/locale.lua b/[core]/es_extended/locale.lua index 98a323db..f9a29e9b 100644 --- a/[core]/es_extended/locale.lua +++ b/[core]/es_extended/locale.lua @@ -25,4 +25,5 @@ function TranslateCap(str, ...) -- Translate string first char uppercase end _ = Translate +-- luacheck: ignore _U _U = TranslateCap diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua index 439ebf10..640debbe 100644 --- a/[core]/es_extended/server/main.lua +++ b/[core]/es_extended/server/main.lua @@ -509,20 +509,20 @@ if not Config.OxInventory then if xPlayer.hasWeapon(itemName) then local _, weapon = xPlayer.getWeapon(itemName) local _, weaponObject = ESX.GetWeapon(itemName) - local pickupLabel = "" + local weaponPickupLabel = "" local components = ESX.Table.Clone(weapon.components) xPlayer.removeWeapon(itemName) if weaponObject.ammo and weapon.ammo > 0 then local ammoLabel = weaponObject.ammo.label - pickupLabel = ("%s [%s %s]"):format(weapon.label, weapon.ammo, ammoLabel) + weaponPickupLabel = ("%s [%s %s]"):format(weapon.label, weapon.ammo, ammoLabel) xPlayer.showNotification(TranslateCap("threw_weapon_ammo", weapon.label, weapon.ammo, ammoLabel)) else - pickupLabel = ("%s"):format(weapon.label) + weaponPickupLabel = ("%s"):format(weapon.label) xPlayer.showNotification(TranslateCap("threw_weapon", weapon.label)) end - ESX.CreatePickup("item_weapon", itemName, weapon.ammo, pickupLabel, playerId, components, weapon.tintIndex) + ESX.CreatePickup("item_weapon", itemName, weapon.ammo, weaponPickupLabel, playerId, components, weapon.tintIndex) end end end)