From 0249ca241bf3931bf929839a6a1bd30bbad30e61 Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Tue, 12 Sep 2017 08:52:46 -0500 Subject: [PATCH 01/10] Update config.lua --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 9e8d1f8b..06146f26 100644 --- a/config.lua +++ b/config.lua @@ -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 Config.EnableNonFreemodePeds = false -- turn this on if you want custom peds Config.EnableSocietyOwnedVehicles = false Config.MaxInService = -1 From 4ffa0fe775e89dcad09c83638898b79921cb9561 Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Tue, 12 Sep 2017 08:56:38 -0500 Subject: [PATCH 02/10] Update main.lua --- server/main.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/main.lua b/server/main.lua index 1fff1ef6..f9944b44 100644 --- a/server/main.lua +++ b/server/main.lua @@ -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 }, From 8b9d63df6f9da9c4dbae94f371b4f327c6a49d0c Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Tue, 12 Sep 2017 08:57:39 -0500 Subject: [PATCH 03/10] Update main.lua --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 44357bfe..7efda18e 100644 --- a/client/main.lua +++ b/client/main.lua @@ -668,7 +668,7 @@ end function OpenIdentityCardMenu(player) - if Config.EnableGCIdentity then + if Config.EnableESXIdentity then ESX.TriggerServerCallback('esx_policejob:getOtherPlayerData', function(data) From 712bd5706d44fe0bdb4140c4f092da41ed39c40b Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Tue, 12 Sep 2017 08:59:10 -0500 Subject: [PATCH 04/10] Update en_config.lua --- localization/en_config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/en_config.lua b/localization/en_config.lua index 4990c8e7..de9bd993 100644 --- a/localization/en_config.lua +++ b/localization/en_config.lua @@ -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 Config.EnableNonFreemodePeds = false -- turn this on if you want custom peds Config.EnableSocietyOwnedVehicles = false Config.MaxInService = -1 From db5a7439cd73a703ed816b447ca24bfa460fdbc1 Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Tue, 12 Sep 2017 08:59:24 -0500 Subject: [PATCH 05/10] Update de_config.lua --- localization/de_config.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/localization/de_config.lua b/localization/de_config.lua index a7c890f7..627a5d4c 100644 --- a/localization/de_config.lua +++ b/localization/de_config.lua @@ -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 Config.EnableNonFreemodePeds = false -- turn this on if you want custom peds Config.EnableSocietyOwnedVehicles = false Config.MaxInService = -1 @@ -79,4 +79,4 @@ Config.PoliceStations = { } -} \ No newline at end of file +} From e0465ea5eba58a0869c795dc27dd9051f5395e7e Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Tue, 12 Sep 2017 08:59:35 -0500 Subject: [PATCH 06/10] Update config.lua --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 06146f26..7e9e041b 100644 --- a/config.lua +++ b/config.lua @@ -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.EnableESXIdentity = false +Config.EnableESXIdentity = false Config.EnableNonFreemodePeds = false -- turn this on if you want custom peds Config.EnableSocietyOwnedVehicles = false Config.MaxInService = -1 From 0462fa7f639fd84a7b85481733ecef7752ebdba2 Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Tue, 12 Sep 2017 09:01:22 -0500 Subject: [PATCH 07/10] Update config.lua --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 7e9e041b..6fbdba41 100644 --- a/config.lua +++ b/config.lua @@ -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.EnableESXIdentity = 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 From edc53cde5da140c3ac745c8ddddd797ddeca43de Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Tue, 12 Sep 2017 09:01:35 -0500 Subject: [PATCH 08/10] Update en_config.lua --- localization/en_config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/en_config.lua b/localization/en_config.lua index de9bd993..880efeba 100644 --- a/localization/en_config.lua +++ b/localization/en_config.lua @@ -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.EnableESXIdentity = 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 From 6fbcd1fd98bb69467439adba0725949ab3cc8c49 Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Tue, 12 Sep 2017 09:01:57 -0500 Subject: [PATCH 09/10] Update de_config.lua --- localization/de_config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/de_config.lua b/localization/de_config.lua index 627a5d4c..bd6585e8 100644 --- a/localization/de_config.lua +++ b/localization/de_config.lua @@ -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.EnableESXIdentity = 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 From b576d444e44361788155dd77e241d44b7534240b Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Tue, 12 Sep 2017 09:10:46 -0500 Subject: [PATCH 10/10] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index adb07de1..4d8d3dcb 100644 --- a/README.md +++ b/README.md @@ -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]