starred/qb-core
1
0
Fork 0
mirror of https://github.com/qbcore-fivem/qb-core.git synced 2026-08-28 17:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

BREAKING COMMIT ⚠️⚠️ Clear player data

Browse Source
This commit is contained in:
LoveFistRP
2021-04-12 11:01:43 -07:00
parent b7bb51ab40
commit a384b2d9e2
3 changed files with 282 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/commands.lua
+8 -5
View File
@@ -98,18 +98,21 @@ QBCore.Commands.Add("setmoney", "Set Players Money Amount (Admin Only)", {{name=
end
end, "admin")
QBCore.Commands.Add("setjob", "Set A Players Job (Admin Only)", {{name="id", help="Speler ID"}, {name="job", help="Job name"}}, true, function(source, args)
QBCore.Commands.Add("setjob", "Set A Players Job (Admin Only)", {{name="id", help="Player ID"}, {name="job", help="Job name"}, {name="grade", help="Grade"}}, true, function(source, args)
local Player = QBCore.Functions.GetPlayer(tonumber(args[1]))
if Player ~= nil then
Player.Functions.SetJob(tostring(args[2]))
else
if (args[1] == nil) or (args[2] == nil) or (args[3] == nil) then
TriggerClientEvent('QBCore:Notify', source, "All Arguments Must Be Filled", "error")
elseif Player == nil then
TriggerClientEvent('QBCore:Notify', source, "Player is not online!", "error")
else
Player.Functions.SetJob(tostring(args[2]), tonumber(args[3]))
end
end, "admin")
QBCore.Commands.Add("job", "Check Your Job", {}, false, function(source, args)
local Player = QBCore.Functions.GetPlayer(source)
TriggerClientEvent('QBCore:Notify', source, "Job: "..Player.PlayerData.job.label)
TriggerClientEvent('QBCore:Notify', source, "Job: "..Player.PlayerData.job.label.. " Grade: "..Player.PlayerData.job.grade.name)
end)
QBCore.Commands.Add("setgang", "Set A Players Gang (Admin Only)", {{name="id", help="Player ID"}, {name="job", help="Name of a gang"}}, true, function(source, args)
server/player.lua
+32 -7
View File
@@ -90,7 +90,8 @@ QBCore.Player.CheckPlayerData = function(source, PlayerData)
}
PlayerData.metadata["licences"] = PlayerData.metadata["licences"] ~= nil and PlayerData.metadata["licences"] or {
["driver"] = true,
["business"] = false
["business"] = false,
["weapon"] = false
}
PlayerData.metadata["inside"] = PlayerData.metadata["inside"] ~= nil and PlayerData.metadata["inside"] or {
house = nil,
@@ -106,13 +107,18 @@ QBCore.Player.CheckPlayerData = function(source, PlayerData)
PlayerData.job = PlayerData.job ~= nil and PlayerData.job or {}
PlayerData.job.name = PlayerData.job.name ~= nil and PlayerData.job.name or "unemployed"
PlayerData.job.label = PlayerData.job.label ~= nil and PlayerData.job.label or "unemployed"
PlayerData.job.label = PlayerData.job.label ~= nil and PlayerData.job.label or ""
PlayerData.job.payment = PlayerData.job.payment ~= nil and PlayerData.job.payment or 10
PlayerData.job.onduty = PlayerData.job.onduty ~= nil and PlayerData.job.onduty or true
-- Added for grade system
PlayerData.job.isboss = PlayerData.job.isboss ~= nil and PlayerData.job.isboss or false
PlayerData.job.grade = PlayerData.job.grade ~= nil and PlayerData.job.grade or {}
PlayerData.job.grade.name = PlayerData.job.grade.name ~= nil and PlayerData.job.grade.name or nil
PlayerData.job.grade.level = PlayerData.job.grade.level ~= nil and PlayerData.job.grade.level or 0
PlayerData.gang = PlayerData.gang ~= nil and PlayerData.gang or {}
PlayerData.gang.name = PlayerData.gang.name ~= nil and PlayerData.gang.name or "geen"
PlayerData.gang.label = PlayerData.gang.label ~= nil and PlayerData.gang.label or "Geen Gang"
PlayerData.gang.name = PlayerData.gang.name ~= nil and PlayerData.gang.name or "none"
PlayerData.gang.label = PlayerData.gang.label ~= nil and PlayerData.gang.label or "No Gang Affiliaton"
PlayerData.position = PlayerData.position ~= nil and PlayerData.position or QBConfig.DefaultSpawn
PlayerData.LoggedIn = true
@@ -131,17 +137,36 @@ QBCore.Player.CreatePlayer = function(PlayerData)
QBCore.Commands.Refresh(self.PlayerData.source)
end
self.Functions.SetJob = function(job)
self.Functions.SetJob = function(job, grade)
local job = job:lower()
local grade = tonumber(grade)
local grade = tostring(grade) ~= nil and tostring(grade) or '0'
if QBCore.Shared.Jobs[job] ~= nil then
self.PlayerData.job.name = job
self.PlayerData.job.label = QBCore.Shared.Jobs[job].label
self.PlayerData.job.payment = QBCore.Shared.Jobs[job].payment
self.PlayerData.job.onduty = QBCore.Shared.Jobs[job].defaultDuty
if QBCore.Shared.Jobs[job].grades[grade] then
local jobgrade = QBCore.Shared.Jobs[job].grades[grade]
self.PlayerData.job.grade = {}
self.PlayerData.job.grade.name = jobgrade.name
self.PlayerData.job.grade.level = tonumber(grade)
self.PlayerData.job.payment = jobgrade.payment ~= nil and jobgrade.payment or 30
self.PlayerData.job.isboss = jobgrade.isboss ~= nil and jobgrade.isboss or false
else
self.PlayerData.job.grade = {}
self.PlayerData.job.grade.name = 'No Grades'
self.PlayerData.job.grade.level = 0
self.PlayerData.job.payment = 30
self.PlayerData.job.isboss = false
end
self.Functions.UpdatePlayerData()
TriggerClientEvent("QBCore:Client:OnJobUpdate", self.PlayerData.source, self.PlayerData.job)
return true
end
return false
end
self.Functions.SetGang = function(gang)