fix(qb-core): add global CreateUsableItem alias for qs-inventory compatibility
qs-inventory apelează CreateUsableItem ca funcție globală, dar qb-core definea doar QBCore.Functions.CreateUseableItem (cu 'e'). Adăugat alias global + fix 16 stringuri sparte în items.lua care blocau parsarea.
This commit is contained in:
@@ -0,0 +1,53 @@
|
||||
if Config.Framework ~= "esx" then
|
||||
return
|
||||
end
|
||||
|
||||
local version = GetResourceMetadata('es_extended', 'version', 0)
|
||||
|
||||
if version == '1.1.0' or version == '1.2.0' or version == 'legacy' then
|
||||
ESX = nil
|
||||
TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
|
||||
else
|
||||
ESX = exports['es_extended']:getSharedObject()
|
||||
end
|
||||
|
||||
function GetPlayerFromIdFramework(player)
|
||||
return ESX.GetPlayerFromId(player)
|
||||
end
|
||||
|
||||
function GetCharacterData(source)
|
||||
local xPlayer = GetPlayerFromIdFramework(source)
|
||||
local firstName, lastName, sex, dateofbirth
|
||||
if xPlayer.get then
|
||||
firstName = xPlayer.get("firstName")
|
||||
lastName = xPlayer.get("lastName")
|
||||
if xPlayer.get("sex") == 'm' then
|
||||
sex = Lang('LICENSES_MAN_LABEL')
|
||||
elseif xPlayer.get("sex") == 'f' then
|
||||
sex = Lang('LICENSES_WOMEN_LABEL')
|
||||
end
|
||||
dateofbirth = xPlayer.get("dateofbirth") or "01/01/2000"
|
||||
else
|
||||
local name = MySQL.Sync.fetchAll("SELECT `firstname`, `lastname`, `dateofbirth`, `sex` FROM `users` WHERE `identifier`=@identifier", {["@identifier"] = ESX.GetIdentifier(source)})
|
||||
firstName = name[1]?.firstname
|
||||
lastName = name[1]?.lastname
|
||||
if name[1]?.sex == 'm' then
|
||||
sex = Lang('LICENSES_MAN_LABEL')
|
||||
elseif name[1]?.sex == 'f' then
|
||||
sex = Lang('LICENSES_WOMEN_LABEL')
|
||||
end
|
||||
dateofbirth = name[1]?.dateofbirth
|
||||
end
|
||||
|
||||
return firstName, lastName, sex, dateofbirth
|
||||
end
|
||||
|
||||
function GetBankMoney(source)
|
||||
local xPlayer = GetPlayerFromIdFramework(source)
|
||||
return xPlayer.getAccount('bank').money
|
||||
end
|
||||
|
||||
function RemoveBankMoney(source, price)
|
||||
local xPlayer = GetPlayerFromIdFramework(source)
|
||||
xPlayer.removeAccountMoney('bank', price)
|
||||
end
|
||||
@@ -0,0 +1,36 @@
|
||||
if Config.Framework ~= 'qb' then
|
||||
return
|
||||
end
|
||||
|
||||
QBCore = exports['qb-core']:GetCoreObject()
|
||||
|
||||
function GetPlayerFromIdFramework(player)
|
||||
local Player = QBCore.Functions.GetPlayer(player)
|
||||
if Player then
|
||||
Player.citizenid = Player?.PlayerData?.citizenid
|
||||
Player.identifier = Player?.PlayerData?.citizenid
|
||||
Player.source = Player?.PlayerData?.source
|
||||
end
|
||||
return Player
|
||||
end
|
||||
|
||||
function GetCharacterData(source)
|
||||
local player = GetPlayerFromIdFramework(source)?.PlayerData?.charinfo
|
||||
local sex
|
||||
if player.gender == 0 then
|
||||
sex = Lang('LICENSES_MAN_LABEL')
|
||||
elseif player.gender == 1 then
|
||||
sex = Lang('LICENSES_WOMEN_LABEL')
|
||||
end
|
||||
return player.firstname, player.lastname, sex, player.birthdate
|
||||
end
|
||||
|
||||
function GetBankMoney(source)
|
||||
local xPlayer = GetPlayerFromIdFramework(source)
|
||||
return xPlayer?.PlayerData?.money['bank']
|
||||
end
|
||||
|
||||
function RemoveBankMoney(source, price)
|
||||
local xPlayer = GetPlayerFromIdFramework(source)
|
||||
xPlayer.Functions.RemoveMoney('bank', price)
|
||||
end
|
||||
Reference in New Issue
Block a user