diff --git a/lib/utility/client/utility.lua b/lib/utility/client/utility.lua index 14b4747..3f410c3 100644 --- a/lib/utility/client/utility.lua +++ b/lib/utility/client/utility.lua @@ -495,6 +495,7 @@ print("Result:", result) ]] + AddEventHandler('onResourceStop', function(resource) if resource ~= GetCurrentResourceName() then return end for _, blip in pairs(blipIDs) do diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index 2597fcd..faf8e02 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -103,14 +103,14 @@ Framework.GetPlayerInventory = function(src) local playerItems = xPlayer.getInventory() local repackedTable = {} for _, v in pairs(playerItems) do - if v.count > 0 then - table.insert(repackedTable, { - name = v.name, - count = v.count, - --metadata = v.metadata, - --slot = v.slot, - }) - end + if v.count > 0 then + table.insert(repackedTable, { + name = v.name, + count = v.count, + --metadata = v.metadata, + --slot = v.slot, + }) + end end return repackedTable end @@ -133,9 +133,9 @@ Framework.GetPlayerMetadata = function(src, metadata) end -- defualt esx Available tables are --- identifier, accounts, group, inventory, job, job_grade, loadout, --- metadata, position, firstname, lastname, dateofbirth, sex, height, --- skin, status, is_dead, id, disabled, last_property, created_at, last_seen, +-- identifier, accounts, group, inventory, job, job_grade, loadout, +-- metadata, position, firstname, lastname, dateofbirth, sex, height, +-- skin, status, is_dead, id, disabled, last_property, created_at, last_seen, -- phone_number, pincode Framework.GetStatus = function(src, column) local xPlayer = ESX.GetPlayerFromId(src) @@ -250,7 +250,10 @@ end Framework.SetPlayerJob = function(src, name, grade) local xPlayer = ESX.GetPlayerFromId(src) if not xPlayer then return end - if not ESX.DoesJobExist(name, grade) then lib.print.error("Job Does Not Exsist In Framework :NAME "..name.." Grade:"..grade) return end + if not ESX.DoesJobExist(name, grade) then + lib.print.error("Job Does Not Exsist In Framework :NAME " .. name .. " Grade:" .. grade) + return + end return xPlayer.setJob(name, grade, true) end @@ -301,14 +304,14 @@ 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 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}) + table.insert(vehicles, { vehicle = model, plate = plate }) end - return vehicles + return vehicles end -- Framework.RegisterUsableItem(item, cb) @@ -339,7 +342,7 @@ AddEventHandler("playerDropped", function() end) lib.callback.register('community_bridge:Callback:GetFrameworkJobs', function(source) - return Framework.GetFrameworkJobs() or {} + return Framework.GetFrameworkJobs() or {} end) Framework.Commands = {} @@ -351,5 +354,3 @@ Framework.Commands.Add = function(name, help, arguments, argsrequired, callback, arguments = arguments }) end - -return Framework \ No newline at end of file diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index 736278e..707d1c6 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -238,7 +238,7 @@ Framework.AddHunger = function(src, value) player.Functions.SetMetaData('hunger', Math.Clamp(newHunger, 0, 100)) TriggerClientEvent('hud:client:UpdateNeeds', src, newHunger, playerData.metadata.thirst) --TriggerClientEvent('hud:client:UpdateStress', src, newStress) - + return newHunger end @@ -277,7 +277,7 @@ end Framework.RevivePlayer = function(src) src = tonumber(src) if not src then return false end - TriggerClientEvent('hospital:client:Revive', src) + TriggerClientEvent('hospital:client:Revive', src) return true end @@ -413,7 +413,8 @@ end Framework.AddItem = function(src, item, amount, slot, metadata) local player = QBCore.Functions.GetPlayer(src) if not player then return end - TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "add", item = item, count = amount, slot = slot, metadata = metadata}) + TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, + { action = "add", item = item, count = amount, slot = slot, metadata = metadata }) return player.Functions.AddItem(item, amount, slot, metadata) end @@ -422,7 +423,8 @@ end Framework.RemoveItem = function(src, item, amount, slot, metadata) local player = QBCore.Functions.GetPlayer(src) if not player then return end - TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "remove", item = item, count = amount, slot = slot, metadata = metadata}) + TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, + { action = "remove", item = item, count = amount, slot = slot, metadata = metadata }) return player.Functions.RemoveItem(item, amount, slot or nil) end @@ -452,12 +454,13 @@ end ---@return table Framework.GetOwnedVehicles = function(src) local citizenId = Framework.GetPlayerIdentifier(src) - local result = MySQL.Sync.fetchAll("SELECT vehicle, plate FROM player_vehicles WHERE citizenid = '" .. citizenId .. "'") + local result = MySQL.Sync.fetchAll("SELECT vehicle, plate FROM player_vehicles WHERE citizenid = '" .. + citizenId .. "'") local vehicles = {} - for i=1, #result do + for i = 1, #result do local vehicle = result[i].vehicle local plate = result[i].plate - table.insert(vehicles, {vehicle = vehicle, plate = plate}) + table.insert(vehicles, { vehicle = vehicle, plate = plate }) end return vehicles end @@ -493,5 +496,3 @@ Framework.Commands = {} Framework.Commands.Add = function(name, help, arguments, argsrequired, callback, permission, ...) QBCore.Commands.Add(name, help, arguments, argsrequired, callback, permission, ...) end - -return Framework \ No newline at end of file diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index f536597..6845f27 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -237,7 +237,7 @@ end Framework.RevivePlayer = function(src) src = tonumber(src) if not src then return false end - TriggerClientEvent('hospital:client:Revive', src) + TriggerClientEvent('hospital:client:Revive', src) return true end @@ -375,7 +375,8 @@ end Framework.AddItem = function(src, item, amount, slot, metadata) local player = QBox:GetPlayer(src) if not player then return end - TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "add", item = item, count = amount, slot = slot, metadata = metadata}) + TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, + { action = "add", item = item, count = amount, slot = slot, metadata = metadata }) return player.Functions.AddItem(item, amount, slot, metadata) end @@ -389,7 +390,8 @@ end Framework.RemoveItem = function(src, item, amount, slot, metadata) local player = QBox:GetPlayer(src) if not player then return end - TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "remove", item = item, count = amount, slot = slot, metadata = metadata}) + TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, + { action = "remove", item = item, count = amount, slot = slot, metadata = metadata }) return player.Functions.RemoveItem(item, amount, slot) end @@ -411,12 +413,13 @@ end ---@return table Framework.GetOwnedVehicles = function(src) local citizenId = Framework.GetPlayerIdentifier(src) - local result = MySQL.Sync.fetchAll("SELECT vehicle, plate FROM player_vehicles WHERE citizenid = '" .. citizenId .. "'") + local result = MySQL.Sync.fetchAll("SELECT vehicle, plate FROM player_vehicles WHERE citizenid = '" .. + citizenId .. "'") local vehicles = {} - for i=1, #result do + for i = 1, #result do local vehicle = result[i].vehicle local plate = result[i].plate - table.insert(vehicles, {vehicle = vehicle, plate = plate}) + table.insert(vehicles, { vehicle = vehicle, plate = plate }) end return vehicles end @@ -449,5 +452,3 @@ AddEventHandler("playerDropped", function() local src = source TriggerEvent("community_bridge:Server:OnPlayerUnload", src) end) - -return Framework \ No newline at end of file