diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index d001235..3e2cd26 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -200,6 +200,19 @@ Framework.RemoveItem = function(src, item, amount, slot, metadata) return xPlayer.removeInventoryItem(item, amount) end +Framework.GetOwnedVehicles = function(src) + local citizenId = Framework.GetPlayerIdentifier(src) + local result = MySQL.Sync.fetchAll("SELECT vehicle, plate FROM owned_vehicles WHERE owner = '" .. citizenId .. "'") + local vehicles = {} + for i=1, #result do + local vehicle = result[i].vehicle + local plate = result[i].plate + local model = json.decode(vehicle).model + table.insert(vehicles, {vehicle = model, plate = plate}) + end + return vehicles +end + -- Framework.RegisterUsableItem(item, cb) -- Registers a usable item with a callback function. Framework.RegisterUsableItem = function(itemName, cb) diff --git a/modules/framework/nd_core/server.lua b/modules/framework/nd_core/server.lua index 5aa7fe4..5ceb7fa 100644 --- a/modules/framework/nd_core/server.lua +++ b/modules/framework/nd_core/server.lua @@ -177,14 +177,16 @@ Framework.GetAccountBalance = function(src, _type) return player.getData(_type) end -RegisterNetEvent("ND:characterUnloaded", function() - TriggerEvent("community_bridge:Server:OnPlayerUnload", source) -end) - -AddEventHandler("playerDropped", function() - local src = source - TriggerEvent("community_bridge:Server:OnPlayerUnload", src) -end) +Framework.GetOwnedVehicles = function(src) + local player = NDCore:getPlayer(src) + local vehicles = NDCore:getVehicles(player.id) + local foundvehicles = {} + for i=1, #vehicles do + local veh = vehicles[i] + table.insert(foundvehicles, {vehicle = veh.properties.model, plate = veh.plate}) + end + return foundvehicles +end Framework.RegisterUsableItem = function(itemName, cb) exports(itemName, function(event, item, inventory, slot, data) @@ -194,4 +196,13 @@ Framework.RegisterUsableItem = function(itemName, cb) return false end end) -end \ No newline at end of file +end + +RegisterNetEvent("ND:characterUnloaded", function() + TriggerEvent("community_bridge:Server:OnPlayerUnload", source) +end) + +AddEventHandler("playerDropped", function() + local src = source + TriggerEvent("community_bridge:Server:OnPlayerUnload", src) +end) \ No newline at end of file diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index 4bfaf13..274790a 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -270,6 +270,18 @@ Framework.SetMetadata = function(src, item, slot, metadata) return player.Functions.AddItem(item, 1, freeSlot, metadata) end +Framework.GetOwnedVehicles = function(src) + local citizenId = Framework.GetPlayerIdentifier(src) + local result = MySQL.Sync.fetchAll("SELECT vehicle, plate FROM player_vehicles WHERE citizenid = '" .. citizenId .. "'") + local vehicles = {} + for i=1, #result do + local vehicle = result[i].vehicle + local plate = result[i].plate + table.insert(vehicles, {vehicle = vehicle, plate = plate}) + end + return vehicles +end + -- Framework.RegisterUsableItem(item, cb) -- Registers a usable item with a callback function. Framework.RegisterUsableItem = function(itemName, cb) diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index d7d51b5..f2b68e9 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -237,6 +237,18 @@ Framework.SetMetadata = function(src, item, slot, metadata) return player.Functions.AddItem(item, 1, slot, metadata) end +Framework.GetOwnedVehicles = function(src) + local citizenId = Framework.GetPlayerIdentifier(src) + local result = MySQL.Sync.fetchAll("SELECT vehicle, plate FROM player_vehicles WHERE citizenid = '" .. citizenId .. "'") + local vehicles = {} + for i=1, #result do + local vehicle = result[i].vehicle + local plate = result[i].plate + table.insert(vehicles, {vehicle = vehicle, plate = plate}) + end + return vehicles +end + RegisterNetEvent("QBCore:Server:OnPlayerUnload", function() TriggerEvent("community_bridge:Server:OnPlayerUnload", source) end) diff --git a/modules/utility/client/utility.lua b/modules/utility/client/utility.lua index 4cc1e60..8bd9fd9 100644 --- a/modules/utility/client/utility.lua +++ b/modules/utility/client/utility.lua @@ -176,6 +176,16 @@ Utility.NotifyText = function(text) DrawNotification(false, true) end +Utility.RequestAnimDict = function(dict) + RequestAnimDict(dict) + local count = 0 + while not HasAnimDictLoaded(dict) and count < 30000 do + Wait(0) + count = count + 1 + end + return HasAnimDictLoaded(dict) +end + Utility.TeleportPlayer = function(coords, conditionFunction, afterTeleportFunction) if conditionFunction ~= nil then if not conditionFunction() then