starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-31 02:08:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16 from ArkSeyonet/master

Browse Source 
Remove Updated GCIdentity Support and Add New ESX_Identity Script Support
This commit is contained in:
Don
2017-09-12 08:39:39 -07:00
committed by GitHub
parent 83bd85c377 b576d444e4
commit df730b91d3
6 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+3
View File
@@ -9,6 +9,9 @@ FXServer ESX Police Job
* Player management (boss actions and armory with buyable weapons)
* esx_society => https://github.com/FXServer-ESX/fxserver-esx_society
* esx_datastore => https://github.com/FXServer-ESX/fxserver-esx_datastore
* ESX Identity Support
* esx_identity => https://github.com/ArkSeyonet/fxserver-esx_identity
[INSTALLATION]
client/main.lua
+1 -1
View File
@@ -668,7 +668,7 @@ end
function OpenIdentityCardMenu(player)
if Config.EnableGCIdentity then
if Config.EnableESXIdentity then
ESX.TriggerServerCallback('esx_policejob:getOtherPlayerData', function(data)
config.lua
+1 -1
View File
@@ -5,7 +5,7 @@ Config.MarkerSize = {x = 1.5, y = 1.5, z = 1.0}
Config.MarkerColor = {r = 50, g = 50, b = 204}
Config.EnablePlayerManagement = false
Config.EnableArmoryManagement = false
Config.EnableGCIdentity = false
Config.EnableESXIdentity = false -- only turn this on if you are using esx_identity
Config.EnableNonFreemodePeds = false -- turn this on if you want custom peds
Config.EnableSocietyOwnedVehicles = false
Config.MaxInService = -1
localization/de_config.lua
+2 -2
View File
@@ -5,7 +5,7 @@ Config.MarkerSize = {x = 1.5, y = 1.5, z = 1.0}
Config.MarkerColor = {r = 50, g = 50, b = 204}
Config.EnablePlayerManagement = false
Config.EnableArmoryManagement = false
Config.EnableGCIdentity = false
Config.EnableESXIdentity = false -- only turn this on if you are using esx_identity
Config.EnableNonFreemodePeds = false -- turn this on if you want custom peds
Config.EnableSocietyOwnedVehicles = false
Config.MaxInService = -1
@@ -79,4 +79,4 @@ Config.PoliceStations = {
}
}
}
localization/en_config.lua
+1 -1
View File
@@ -5,7 +5,7 @@ Config.MarkerSize = {x = 1.5, y = 1.5, z = 1.0}
Config.MarkerColor = {r = 50, g = 50, b = 204}
Config.EnablePlayerManagement = false
Config.EnableArmoryManagement = false
Config.EnableGCIdentity = false
Config.EnableESXIdentity = false -- only turn this on if you are using esx_identity
Config.EnableNonFreemodePeds = false -- turn this on if you want custom peds
Config.EnableSocietyOwnedVehicles = false
Config.MaxInService = -1
server/main.lua
+6 -6
View File
@@ -121,13 +121,13 @@ end)
ESX.RegisterServerCallback('esx_policejob:getOtherPlayerData', function(source, cb, target)
if Config.EnableGCIdentity then
if Config.EnableESXIdentity then
local xPlayer = ESX.GetPlayerFromId(target)
local identifier = GetPlayerIdentifiers(target)[1]
local result = MySQL.Sync.fetchAll("SELECT firstname, lastname, sex, dateofbirth, height FROM users WHERE identifier = @identifier", {
local result = MySQL.Sync.fetchAll("SELECT * FROM characters WHERE identifier = @identifier", {
['@identifier'] = identifier
})
@@ -135,10 +135,10 @@ ESX.RegisterServerCallback('esx_policejob:getOtherPlayerData', function(source,
local firstname = user['firstname']
local lastname = user['lastname']
local sex = user['sex']
local dob = tostring(user['dateofbirth'])
local dob = user['dateofbirth']
local heightInit = user['height']
local heightFeet = tonumber(string.format("%.0f",heightInit / 12, 0))
local heightInches = heightInit % 12
local heightInches = tonumber(string.format("%.0f",heightInit % 12, 0))
local height = heightFeet .. "\' " .. heightInches .. "\""
local data = {
@@ -214,7 +214,7 @@ end)
ESX.RegisterServerCallback('esx_policejob:getVehicleInfos', function(source, cb, plate)
if Config.EnableGCIdentity then
if Config.EnableESXIdentity then
MySQL.Async.fetchAll(
'SELECT * FROM owned_vehicles',
@@ -237,7 +237,7 @@ ESX.RegisterServerCallback('esx_policejob:getVehicleInfos', function(source, cb,
if foundIdentifier ~= nil then
MySQL.Async.fetchAll(
'SELECT * FROM users WHERE identifier = @identifier',
'SELECT * FROM characters WHERE identifier = @identifier',
{
['@identifier'] = foundIdentifier
},