Merge pull request #579 from bitpredator/dev

fix: No such export getSharedObject in resource es_extended
bitpredator · Dec 5, 2023 · c035067 · c035067
2 parents cb50e34 + a63b205
commit c035067
Show file tree

Hide file tree

Showing 27 changed files with 762 additions and 400 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -69,4 +69,7 @@ fix lint error: unused argument last; accessing undefined variable Invoke; unuse
 42. [esx_joblisting]: refactor: correct the good year for the license + varius fix @bitpredator
 43. [EUP]: delete: removed package [EUP] @bitpredator
 44. [bpt_ammujob]: refactor: bpt_ammujob inventory implementation @bitpredator
-45. [SQL]: fix: es_extended.sql "addon_inventory" syntax error @bitpredator
+45. [SQL]: fix: es_extended.sql "addon_inventory" syntax error @bitpredator
+46. [npwd]: fix: Warning: could not find @bitpredator
+47. [server.cfg]: fix: Couldn't find resource @bitpredator
+48. fix: No such export getSharedObject in resource es_extended @bitpredator
diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua b/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua
@@ -10,7 +10,6 @@ local Keys = {
  ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118
 }
 
-ESX = nil
 local labels = {}
 local craftingQueue = {}
 local job = ""

diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/server/main.lua b/server-data/resources/[bpt_addons]/bpt_crafting/server/main.lua
@@ -1,4 +1,3 @@
-ESX = nil
 ESX = exports["es_extended"]:getSharedObject()
 function setCraftingLevel(identifier, level)
     MySQL.Async.execute(

diff --git a/server-data/resources/[bpt_addons]/bpt_farmer/fxmanifest.lua b/server-data/resources/[bpt_addons]/bpt_farmer/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'bpt_farmer, introduces various collection points for the crafting system (not a job)'
 author'bitpredator'
-version'0.0.4'
+version'1.0.0'
 
 shared_script '@es_extended/imports.lua'
 

diff --git a/server-data/resources/[bpt_addons]/bpt_hud/client/status.lua b/server-data/resources/[bpt_addons]/bpt_hud/client/status.lua
@@ -3,7 +3,6 @@ local armor = 0
 local food = 0
 local thirst = 0
 local posi = "bottom"
-ESX = nil
 
 ESX = exports["es_extended"]:getSharedObject()
 

diff --git a/server-data/resources/[bpt_addons]/bpt_hud/fxmanifest.lua b/server-data/resources/[bpt_addons]/bpt_hud/fxmanifest.lua
@@ -3,10 +3,12 @@ fx_version 'adamant'
 game 'gta5'
 author 'bitpredator'
 description 'bitpredator HUD'
-version '0.0.4'
+version '1.0.0'
 
 ui_page 'html/ui.html'
 
+shared_script '@es_extended/imports.lua'
+
 files {
 	'html/*.css',
 	'html/*.js',

diff --git a/server-data/resources/[bpt_addons]/bpt_lumberjack/client/main.lua b/server-data/resources/[bpt_addons]/bpt_lumberjack/client/main.lua
@@ -10,7 +10,6 @@ Keys = {
 	["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118
 }
 
-ESX = nil
 local menuOpen = false
 
 CreateThread(function()

diff --git a/server-data/resources/[bpt_addons]/bpt_lumberjack/server/main.lua b/server-data/resources/[bpt_addons]/bpt_lumberjack/server/main.lua
@@ -1,4 +1,3 @@
-ESX = nil
 ESX = exports["es_extended"]:getSharedObject()
 
 RegisterServerEvent('bpt_woodcutter:pickedUpWood')

diff --git a/server-data/resources/[bpt_addons]/bpt_teleport/fxmanifest.lua b/server-data/resources/[bpt_addons]/bpt_teleport/fxmanifest.lua
@@ -6,7 +6,9 @@ author 'bitpredator'
 
 description 'bpt_teleport'
 
-version '0.0.4'
+version '1.0.0'
+
+shared_script '@es_extended/imports.lua'
 
 client_scripts {
     '@es_extended/locale.lua',

diff --git a/server-data/resources/[esx]/es_extended/imports.lua b/server-data/resources/[esx]/es_extended/imports.lua
@@ -1,13 +1,12 @@
----@diagnostic disable: missing-fields
 ESX = exports['es_extended']:getSharedObject()
 
 if not IsDuplicityVersion() then -- Only register this event for the client
-    AddEventHandler('esx:setPlayerData', function(key, val)
+    AddEventHandler('esx:setPlayerData', function(key, val, last)
         if GetInvokingResource() == 'es_extended' then
             ESX.PlayerData[key] = val
-            -- if OnPlayerData then not used?
-            --     OnPlayerData(key, val, last)
-            -- end
+            if OnPlayerData then
+                OnPlayerData(key, val, last)
+            end
         end
     end)
 

diff --git a/server-data/resources/[esx_addons]/esx_ambulancejob/client/main.lua b/server-data/resources/[esx_addons]/esx_ambulancejob/client/main.lua
@@ -1,7 +1,6 @@
 local firstSpawn, PlayerLoaded = true, false
 
 isDead, isSearched, medic = false, false, 0
-ESX = nil
 
 AddEventHandler("onClientMapStart", function()
 	exports.spawnmanager:spawnPlayer()
@@ -10,15 +9,10 @@ AddEventHandler("onClientMapStart", function()
 end)
 
 CreateThread(function()
-	while ESX == nil do
-		ESX = exports["es_extended"]:getSharedObject()
-		Wait(0)
-	end
-
+	ESX = exports["es_extended"]:getSharedObject()
 	while ESX.GetPlayerData().job == nil do
 		Wait(100)
 	end
-
 	PlayerLoaded = true
 	ESX.PlayerData = ESX.GetPlayerData()
 end)

diff --git a/server-data/resources/[esx_addons]/esx_ambulancejob/server/main.lua b/server-data/resources/[esx_addons]/esx_ambulancejob/server/main.lua
@@ -1,4 +1,3 @@
-ESX = nil
 local playersHealing, deadPlayers = {}, {}
 
 ESX = exports["es_extended"]:getSharedObject()