From 234d191dd8bf3cd28984390640cd53acf7cb55c6 Mon Sep 17 00:00:00 2001
From: bitpredator <67551273+bitpredator@users.noreply.github.com>
Date: Mon, 20 Nov 2023 20:21:35 +0100
Subject: [PATCH] fix: value assigned to variable ESX is overwritten

---
 .github/CHANGELOG.md                                         | 3 ++-
 .../resources/[esx_addons]/jsfour-idcard/fxmanifest.lua      | 3 +--
 .../resources/[esx_addons]/jsfour-idcard/html/index.html     | 2 +-
 server-data/resources/[esx_addons]/jsfour-idcard/server.lua  | 5 +----
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index e1ddef36f..0f1ea06b7 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -58,4 +58,5 @@
 33. [esx_dmvschool]: fix: fix lint error @bitpredator
 34. [oxmysql]: chore: update to version 2.7.6 @bitpredator
 35. [esx-radio] fix: fixed No such export addChannelCheck in resource pma-voice @bitpredator
-36. [bpt_vehicletax]: chore: clean up the code @bitpredator
\ No newline at end of file
+36. [bpt_vehicletax]: chore: clean up the code @bitpredator
+37. [jsfour-idcard]: fix: value assigned to variable ESX is overwritten @bitpredator
\ No newline at end of file
diff --git a/server-data/resources/[esx_addons]/jsfour-idcard/fxmanifest.lua b/server-data/resources/[esx_addons]/jsfour-idcard/fxmanifest.lua
index 731c3d496..dc23215cd 100644
--- a/server-data/resources/[esx_addons]/jsfour-idcard/fxmanifest.lua
+++ b/server-data/resources/[esx_addons]/jsfour-idcard/fxmanifest.lua
@@ -1,7 +1,6 @@
 fx_version 'adamant'
-
 game 'gta5'
-
+version '1.0.0'
 ui_page 'html/index.html'
 
 shared_script '@es_extended/imports.lua'
diff --git a/server-data/resources/[esx_addons]/jsfour-idcard/html/index.html b/server-data/resources/[esx_addons]/jsfour-idcard/html/index.html
index 7eca4f82c..35f5e7e35 100644
--- a/server-data/resources/[esx_addons]/jsfour-idcard/html/index.html
+++ b/server-data/resources/[esx_addons]/jsfour-idcard/html/index.html
@@ -24,4 +24,4 @@
     <script src="assets/js/materialize.js" type="text/javascript"></script>
     <script src="assets/js/init.js" type="text/javascript"></script>
   </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/server-data/resources/[esx_addons]/jsfour-idcard/server.lua b/server-data/resources/[esx_addons]/jsfour-idcard/server.lua
index bc14400eb..7de71d6fd 100644
--- a/server-data/resources/[esx_addons]/jsfour-idcard/server.lua
+++ b/server-data/resources/[esx_addons]/jsfour-idcard/server.lua
@@ -1,10 +1,7 @@
-local ESX = nil
--- ESX
-ESX = exports["es_extended"]:getSharedObject()
-
 -- Open ID card
 RegisterServerEvent('jsfour-idcard:open')
 AddEventHandler('jsfour-idcard:open', function(ID, targetID, type)
+	ESX = exports["es_extended"]:getSharedObject()
 	local identifier = ESX.GetPlayerFromId(ID).identifier
 	local _source 	 = ESX.GetPlayerFromId(targetID).source
 	local show       = false