From 44a0021b7bfeb35b8faef0b83656ec4a8f796613 Mon Sep 17 00:00:00 2001
From: Tony Stark <76168122+tony-stark-17@users.noreply.github.com>
Date: Fri, 16 Dec 2022 09:21:19 +0530
Subject: [PATCH] fix: Moved checks to if xPlayer isn't nil

---
 [esx]/esx_identity/server/main.lua | 42 ++++++++++++++----------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/[esx]/esx_identity/server/main.lua b/[esx]/esx_identity/server/main.lua
index 08ed89c9..f15671d7 100644
--- a/[esx]/esx_identity/server/main.lua
+++ b/[esx]/esx_identity/server/main.lua
@@ -373,29 +373,27 @@ else
 
 	ESX.RegisterServerCallback('esx_identity:registerIdentity', function(source, cb, data)
 		local xPlayer = ESX.GetPlayerFromId(source)
-
-        if not checkNameFormat(data.firstname) then
-            xPlayer.showNotification(TranslateCap('invalid_firstname_format'), "error")
-            return cb(false)
-        end
-        if not checkNameFormat(data.lastname) then
-            xPlayer.showNotification(TranslateCap('invalid_lastname_format'), "error")
-            return cb(false)
-        end
-        if not checkSexFormat(data.sex) then
-            xPlayer.showNotification(TranslateCap('invalid_sex_format'), "error")
-            return cb(false)
-        end
-        if not checkDOBFormat(data.dateofbirth) then
-            xPlayer.showNotification(TranslateCap('invalid_dob_format'), "error")
-            return cb(false)
-        end
-        if not checkHeightFormat(data.height) then
-            xPlayer.showNotification(TranslateCap('invalid_height_format'), "error")
-            return cb(false)
-        end
-
 		if xPlayer then
+			if not checkNameFormat(data.firstname) then
+            			xPlayer.showNotification(TranslateCap('invalid_firstname_format'), "error")
+            			return cb(false)
+        		end
+        		if not checkNameFormat(data.lastname) then
+            			xPlayer.showNotification(TranslateCap('invalid_lastname_format'), "error")
+            			return cb(false)
+        		end
+        		if not checkSexFormat(data.sex) then
+            			xPlayer.showNotification(TranslateCap('invalid_sex_format'), "error")
+            			return cb(false)
+        		end
+        		if not checkDOBFormat(data.dateofbirth) then
+            			xPlayer.showNotification(TranslateCap('invalid_dob_format'), "error")
+            			return cb(false)
+        		end
+        		if not checkHeightFormat(data.height) then
+            			xPlayer.showNotification(TranslateCap('invalid_height_format'), "error")
+            			return cb(false)
+        		end	
 			if alreadyRegistered[xPlayer.identifier] then
 				xPlayer.showNotification(TranslateCap('already_registered'), "error")
 				return cb(false)