From a9705ac27193ca40aecdb8fd6e64401d13654d83 Mon Sep 17 00:00:00 2001
From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com>
Date: Wed, 13 Sep 2017 09:56:03 -0500
Subject: [PATCH 1/4] Update server.lua

---
 server.lua | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/server.lua b/server.lua
index 62a8cdba..46797e93 100644
--- a/server.lua
+++ b/server.lua
@@ -11,22 +11,19 @@
 --===============================================
 function getIdentity(source)
     local identifier = GetPlayerIdentifiers(source)[1]
-    local result = MySQL.Sync.fetchAll("SELECT * FROM characters WHERE identifier = @identifier", {
+    local result = MySQL.Sync.fetchAll("SELECT firstname, lastname FROM characters WHERE identifier = @identifier", {
         ['@identifier'] = identifier
     })
 	if result[1] ~= nil then
 		local identity = result[1]
 	
 		return {
-			identifier = identity['identifier'],
-			firstname = identity['firstname'],
-			lastname = identity['lastname'],
-			dateofbirth = identity['dateofbirth'],
-			sex = identity['sex'],
-			height = identity['height']
+			firstname 		= identity['firstname']
 		}
 	else
-		return nil
+		return {
+			firstname 	= ''
+		}	
     end
 end
 
@@ -59,9 +56,11 @@ end)
 --===============================================
 AddEventHandler('es:playerLoaded', function(source)
 	local result = getIdentity(source)
-	if result ~= nil then
+	if result.firstname == '' then
+		print('Player Does Not Have An Identity')
+		Wait(2000)
         TriggerClientEvent('esx_identity:showRegisterIdentity', source)
     else
+		print('Player Has An Identity')
     end
 end)
-

From 6ffe62c364ef11a85ad61f3dc754c96e27b0f757 Mon Sep 17 00:00:00 2001
From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com>
Date: Wed, 13 Sep 2017 09:59:05 -0500
Subject: [PATCH 2/4] Update server.lua

---
 server.lua | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/server.lua b/server.lua
index 46797e93..4b92fbc2 100644
--- a/server.lua
+++ b/server.lua
@@ -11,18 +11,26 @@
 --===============================================
 function getIdentity(source)
     local identifier = GetPlayerIdentifiers(source)[1]
-    local result = MySQL.Sync.fetchAll("SELECT firstname, lastname FROM characters WHERE identifier = @identifier", {
+    local result = MySQL.Sync.fetchAll("SELECT * FROM characters WHERE identifier = @identifier", {
         ['@identifier'] = identifier
     })
 	if result[1] ~= nil then
 		local identity = result[1]
 	
 		return {
-			firstname 		= identity['firstname']
+			firstname 		= identity['firstname'],
+			lastname		= identity['lastname'],
+			dateofbirth		= identity['dateofbirth'],
+			sex			= identity['sex'],
+			height			= identity['height']
 		}
 	else
 		return {
-			firstname 	= ''
+			firstname 	= '',
+			lastname	= '',
+			dateofbirth	= '',
+			sex		= '',
+			height		= ''
 		}	
     end
 end

From d0b76fd4de8ce50fce40978fd34737da70fc1df4 Mon Sep 17 00:00:00 2001
From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com>
Date: Wed, 13 Sep 2017 10:00:31 -0500
Subject: [PATCH 3/4] Update server.lua

---
 server.lua | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/server.lua b/server.lua
index 4b92fbc2..1b48aae6 100644
--- a/server.lua
+++ b/server.lua
@@ -42,12 +42,12 @@ function createIdentity(identifier, data)
 	MySQL.Sync.execute(
 		'INSERT INTO characters (identifier, firstname, lastname, dateofbirth, sex, height) VALUES (@identifier, @firstname, @lastname, @dateofbirth, @sex, @height)',
 		{
-			['@identifier'] = identifier,
-			['@firstname']  = data.firstname,
-			['@lastname'] 	= data.lastname,
-			['@dateofbirth'] = data.dateofbirth,
+			['@identifier'] 	= identifier,
+			['@firstname']  	= data.firstname,
+			['@lastname'] 		= data.lastname,
+			['@dateofbirth'] 	= data.dateofbirth,
 			['@sex']		= data.sex,
-			['@height'] 	= data.height
+			['@height'] 		= data.height
 		})
 end
 
@@ -65,10 +65,9 @@ end)
 AddEventHandler('es:playerLoaded', function(source)
 	local result = getIdentity(source)
 	if result.firstname == '' then
-		print('Player Does Not Have An Identity')
-		Wait(2000)
-        TriggerClientEvent('esx_identity:showRegisterIdentity', source)
-    else
-		print('Player Has An Identity')
-    end
+		Wait(500)
+        	TriggerClientEvent('esx_identity:showRegisterIdentity', source)
+    	else
+		print('Player Has An Identity. Continuing.')
+    	end
 end)

From 6f7980d6e789a5747dd9ceb1f260ca9b201b3868 Mon Sep 17 00:00:00 2001
From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com>
Date: Wed, 13 Sep 2017 10:01:53 -0500
Subject: [PATCH 4/4] Update server.lua

---
 server.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server.lua b/server.lua
index 1b48aae6..a0e4208e 100644
--- a/server.lua
+++ b/server.lua
@@ -18,11 +18,11 @@ function getIdentity(source)
 		local identity = result[1]
 	
 		return {
-			firstname 		= identity['firstname'],
-			lastname		= identity['lastname'],
-			dateofbirth		= identity['dateofbirth'],
-			sex			= identity['sex'],
-			height			= identity['height']
+			firstname 	= identity['firstname'],
+			lastname	= identity['lastname'],
+			dateofbirth	= identity['dateofbirth'],
+			sex		= identity['sex'],
+			height		= identity['height']
 		}
 	else
 		return {