From 900173887f3833606131e4be34be8cbbfe852ce4 Mon Sep 17 00:00:00 2001
From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com>
Date: Mon, 4 Sep 2017 20:12:18 -0500
Subject: [PATCH] Update main.lua

---
 server/main.lua | 58 ++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 8 deletions(-)

diff --git a/server/main.lua b/server/main.lua
index b938d860..823ce96d 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -116,16 +116,30 @@ end)
 
 ESX.RegisterServerCallback('esx_policejob:getOtherPlayerData', function(source, cb, target)
 
+	if Config.EnableGCIdentity 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", {
+			['@identifier'] = identifier
+		})
+			
+		local user 			= result[1]
+		local firstname 	= user['firstname']
+		local lastname  	= user['lastname']
+		
 		local data = {
-			name       = GetPlayerName(target),
-			job        = xPlayer.job,
-			inventory  = xPlayer.inventory,
-			accounts   = xPlayer.accounts,
-			weapons    = xPlayer.loadout
+			name       	= GetPlayerName(target),
+			job        	= xPlayer.job,
+			inventory  	= xPlayer.inventory,
+			accounts   	= xPlayer.accounts,
+			weapons    	= xPlayer.loadout,
+			firstname  	= firstname,
+			lastname   	= lastname		
 		}
-
+		
 		TriggerEvent('esx_status:getStatus', _source, 'drunk', function(status)
 
 			if status ~= nil then
@@ -139,6 +153,34 @@ ESX.RegisterServerCallback('esx_policejob:getOtherPlayerData', function(source,
 		end)
 
 		cb(data)
+	
+	else
+	
+		local xPlayer = ESX.GetPlayerFromId(target)
+
+		local data = {
+			name       = GetPlayerName(target),
+			job        = xPlayer.job,
+			inventory  = xPlayer.inventory,
+			accounts   = xPlayer.accounts,
+			weapons    = xPlayer.loadout
+		}
+			
+		TriggerEvent('esx_status:getStatus', _source, 'drunk', function(status)
+
+			if status ~= nil then
+				data.drunk = status.getPercent()
+			end
+			
+		end)
+
+		TriggerEvent('esx_license:getLicenses', _source, function(licenses)
+			data.licenses = licenses
+		end)
+
+		cb(data)
+		
+	end
 
 end)
 
@@ -335,4 +377,4 @@ ESX.RegisterServerCallback('esx_policejob:getPlayerInventory', function(source,
 		items = items
 	})
 
-end)
\ No newline at end of file
+end)